Skip to content

refactor: replace @import -> @use in sources #477

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Nov 21, 2025
Merged

refactor: replace @import -> @use in sources #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70f0fa1
refactor: replace `@import` -> `@use`
ogonkov Oct 20, 2025
7ef9cbe
fix: import
ogonkov Oct 20, 2025
ad88f41
chore: change alias resolve
ogonkov Oct 20, 2025
8db433a
chore: change vite options
ogonkov Oct 20, 2025
b8766ec
revert: non-essential files
ogonkov Nov 21, 2025
56f7a33
revert: non-essential files
ogonkov Nov 21, 2025
b6299dd
fix: import mixins
ogonkov Nov 21, 2025
6724fb0
fix: import mixins
ogonkov Nov 21, 2025
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
2 changes: 1 addition & 1 deletion src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../styles/mixins';
@import '~@gravity-ui/uikit/styles/mixins';

body {
margin: 0;
Expand Down
7 changes: 3 additions & 4 deletions src/components/Footer/MenuItem/MenuItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../variables';

@import '../../../../styles/mixins';

$block: '.#{variables.$ns}footer-menu-item';

#{$block} {
Expand All @@ -13,9 +12,9 @@ $block: '.#{variables.$ns}footer-menu-item';
height: 100%;

.g-menu__item-content {
@include overflow-ellipsis(ellipsis);
@include mixins.overflow-ellipsis(ellipsis);

@include text-body-1;
@include mixins.text-body-1;
color: var(--g-color-text-secondary);
}

Expand Down
7 changes: 3 additions & 4 deletions src/components/Footer/desktop/Footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../variables';

@import '../../../../styles/mixins';

$block: '.#{variables.$ns}footer';

#{$block}_desktop {
Expand Down Expand Up @@ -47,12 +46,12 @@ $block: '.#{variables.$ns}footer';
}

&__copyright {
@include text-body-1;
@include mixins.text-body-1;
color: var(--g-color-text-secondary);
white-space: nowrap;

&_small {
@include text-caption-2;
@include mixins.text-caption-2;
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/components/Footer/mobile/Footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../variables';

@import '../../../../styles/mixins';

$block: '.#{variables.$ns}footer';

#{$block}_mobile {
Expand Down Expand Up @@ -46,7 +45,7 @@ $block: '.#{variables.$ns}footer';
}

&__copyright {
@include text-caption-2;
@include mixins.text-caption-2;
color: var(--g-color-text-secondary);
white-space: nowrap;
padding: 0 var(--g-spacing-3);
Expand All @@ -59,7 +58,7 @@ $block: '.#{variables.$ns}footer';
&__menu-item {
height: 48px;

@include text-body-2;
@include mixins.text-body-2;
color: var(--g-color-text-primary);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/FooterItem/__stories__/FooterItemShowcase.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../styles/mixins';
@import '~@gravity-ui/uikit/styles/mixins';

.footer-item-showcase {
--gn-aside-header-min-width: 56px;
Expand Down
2 changes: 0 additions & 2 deletions src/components/HotkeysPanel/HotkeysPanel.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@use '../variables';

@import '../../../styles/mixins';

$block: '.#{variables.$ns}hotkeys-panel';

#{$block} {
Expand Down
2 changes: 0 additions & 2 deletions src/components/Logo/Logo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@use '../variables';

@import '../../../styles/mixins';

$block: '.#{variables.$ns}logo';

#{$block} {
Expand Down
5 changes: 2 additions & 3 deletions src/components/MobileHeader/Burger/Burger.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../variables';

@import '~@gravity-ui/uikit/styles/mixins';

$block: '.#{variables.$ns}mobile-header-burger';

#{$block} {
$class: &;
@include button-reset();
@include mixins.button-reset();

&_opened {
#{$class}__icon {
Expand Down
8 changes: 3 additions & 5 deletions src/components/MobileHeader/BurgerMenu/BurgerCompositeBar/BurgerCompositeBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../../variables';

@import '~@gravity-ui/uikit/styles/mixins';
@import '../../../../../styles/mixins';

$block: '.#{variables.$ns}burger-composite-bar';

#{$block} {
Expand Down Expand Up @@ -33,8 +31,8 @@ $block: '.#{variables.$ns}burger-composite-bar';
}

&__item-title {
@include overflow-ellipsis();
@include text-body-2();
@include mixins.overflow-ellipsis();
@include mixins.text-body-2();
}

&__link {
Expand Down
5 changes: 2 additions & 3 deletions src/components/MobileHeader/FooterItem/FooterItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../variables';

@import '~@gravity-ui/uikit/styles/mixins';

$block: '.#{variables.$ns}mobile-header-footer-item';

#{$block} {
Expand All @@ -11,7 +10,7 @@ $block: '.#{variables.$ns}mobile-header-footer-item';
position: relative;

&__button {
@include button-reset();
@include mixins.button-reset();

display: flex;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/MobileHeader/__stories__/MobileHeaderShowcase.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../styles/mixins';
@import '~@gravity-ui/uikit/styles/mixins';

body {
margin: 0;
Expand Down
7 changes: 3 additions & 4 deletions src/components/MobileLogo/MobileLogo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../variables';

@import '../../../styles/mixins';

$block: '.#{variables.$ns}mobile-logo';

#{$block} {
Expand All @@ -28,7 +27,7 @@ $block: '.#{variables.$ns}mobile-logo';
}

&__title {
@include text-header-1();
@include overflow-ellipsis();
@include mixins.text-header-1();
@include mixins.overflow-ellipsis();
}
}
5 changes: 2 additions & 3 deletions src/components/Settings/SettingsMenu/SettingsMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
@use '~@gravity-ui/uikit/styles/mixins';
@use '../../variables';

@import '../../../../styles/mixins';

$block: '.#{variables.$ns}settings-menu';

#{$block} {
&__group {
&-heading {
@include text-accent;
@include mixins.text-accent;
display: inline-block;
padding: 0 20px;
margin-bottom: 12px;
Expand Down
2 changes: 0 additions & 2 deletions src/components/Settings/SettingsMenuMobile/SettingsMenuMobile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@use '../../variables';

@import '../../../../styles/mixins';

$block: '.#{variables.$ns}settings-menu-mobile';

#{$block} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Settings/__stories__/SettingsMobileDemo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../styles/mixins';
@import '~@gravity-ui/uikit/styles/mixins';

.settings-mobile-demo {
height: 100%;
Expand Down
2 changes: 0 additions & 2 deletions src/components/Title/Title.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
@use '../variables';

@import '../../../styles/mixins';

$block: '.#{variables.$ns}title';

#{$block} {
Expand Down
2 changes: 0 additions & 2 deletions styles/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '~@gravity-ui/uikit/styles/mixins';

@mixin aside-header-button() {
&_current::before {
background-color: var(--g-color-base-selection);
Expand Down
Loading