Skip to content

chore(styles): use new SCSS api #1722

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 1 commit into from
Nov 28, 2024
+176 −185
Merged

chore(styles): use new SCSS api #1722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/BasicNodeViewer/BasicNodeViewer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.basic-node-viewer {
display: flex;
align-items: center;

margin: 15px 0;

@include body-2-typography();
@include mixins.body-2-typography();

&__title {
margin: 0 20px 0 0;
Expand Down
4 changes: 2 additions & 2 deletions src/components/DeveloperUILinkButton/DeveloperUILinkButton.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.developer-ui-link-button {
@include table-hover-appearing-button();
@include mixins.table-hover-appearing-button();
}
4 changes: 2 additions & 2 deletions src/components/DiskStateProgressBar/DiskStateProgressBar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins';
@use '../../styles/mixins';

.storage-disk-progress-bar {
$block: &;
Expand All @@ -22,7 +22,7 @@
border: $border-width solid var(--entity-state-border-color);
border-radius: $outer-border-radius;
background-color: var(--entity-state-background-color);
@include entity-state-colors();
@include mixins.entity-state-colors();

&_compact {
min-width: 0;
Expand Down
8 changes: 4 additions & 4 deletions src/components/EmptyState/EmptyState.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.empty-state {
padding: 20px;
Expand Down Expand Up @@ -50,18 +50,18 @@
font-weight: 500;

&_size_s {
@include lead-typography();
@include mixins.lead-typography();
}

&_size_m {
@include header-2-typography();
@include mixins.header-2-typography();
}
}

&__description {
grid-area: description;

@include body-2-typography();
@include mixins.body-2-typography();
}

&__actions {
Expand Down
4 changes: 2 additions & 2 deletions src/components/EntityPageTitle/EntityPageTitle.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-entity-page-title {
display: flex;
Expand All @@ -7,7 +7,7 @@

text-wrap: nowrap;

@include header-2-typography();
@include mixins.header-2-typography();

&__prefix {
margin-right: 6px;
Expand Down
8 changes: 4 additions & 4 deletions src/components/EntityStatus/EntityStatus.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.entity-status {
--button-width: 28px;
Expand All @@ -10,7 +10,7 @@
max-width: 100%;
height: 100%;

@include body-2-typography();
@include mixins.body-2-typography();

&__icon {
margin-right: var(--g-spacing-2);
Expand All @@ -19,7 +19,7 @@
&__clipboard-button {
color: var(--g-color-text-secondary);

@include table-hover-appearing-button();
@include mixins.table-hover-appearing-button();

&_visible {
opacity: 1;
Expand Down Expand Up @@ -68,7 +68,7 @@

color: var(--g-color-text-complementary);

@include body-2-typography();
@include mixins.body-2-typography();

&_size_l {
font-size: var(--g-text-header-2-font-size);
Expand Down
6 changes: 3 additions & 3 deletions src/components/ErrorBoundary/ErrorBoundary.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-error-boundary {
display: flex;
Expand All @@ -7,7 +7,7 @@

padding: 20px;

@include body-2-typography();
@include mixins.body-2-typography();

&__illustration {
width: 230px;
Expand All @@ -16,7 +16,7 @@
}
&__error-title {
margin-top: 44px;
@include lead-typography();
@include mixins.lead-typography();
}
&__error-description {
margin-top: 12px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/FullNodeViewer/FullNodeViewer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.full-node-viewer {
@include body-2-typography();
@include mixins.body-2-typography();

&__common-info {
display: flex;
Expand Down
2 changes: 0 additions & 2 deletions src/components/MemoryViewer/MemoryViewer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@import '../../styles/mixins.scss';

$memory-type-colors: (
'AllocatorCachesMemory': var(--g-color-base-utility-medium-hover),
'SharedCacheConsumption': var(--g-color-base-info-medium-hover),
Expand Down
4 changes: 2 additions & 2 deletions src/components/PageMeta/PageMeta.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles//mixins.scss';
@use '../../styles//mixins.scss';

.ydb-page-meta {
&__info {
Expand All @@ -12,7 +12,7 @@

color: var(--g-color-text-primary);

@include body-2-typography();
@include mixins.body-2-typography();
}

&__skeleton {
Expand Down
6 changes: 3 additions & 3 deletions src/components/PaginatedTable/PaginatedTable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-paginated-table {
$block: &;
Expand All @@ -10,7 +10,7 @@
--paginated-table-hover-color: var(--g-color-base-float);

width: 100%;
@include body-2-typography();
@include mixins.body-2-typography();

&__table {
width: max-content;
Expand Down Expand Up @@ -46,7 +46,7 @@

&__head {
z-index: 2;
@include sticky-top();
@include mixins.sticky-top();
}

&__sort-icon-container {
Expand Down
4 changes: 2 additions & 2 deletions src/components/PoolUsage/PoolUsage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-pool-usage {
@include body-2-typography();
@include mixins.body-2-typography();

&__info {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions src/components/ProgressViewer/ProgressViewer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.progress-viewer {
$block: &;
Expand Down Expand Up @@ -68,7 +68,7 @@
&_size_xs {
height: 20px;

@include body-2-typography();
@include mixins.body-2-typography();
}

&_size_s {
Expand Down
4 changes: 2 additions & 2 deletions src/components/QueryResultTable/QueryResultTable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-query-result-table {
&__cell {
width: 100%;
@include cell-container;
@include mixins.cell-container;
}

&__message {
Expand Down
8 changes: 4 additions & 4 deletions src/components/TableWithControlsLayout/TableWithControlsLayout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-table-with-controls-layout {
--data-table-sticky-top-offset: 62px;
Expand All @@ -14,7 +14,7 @@
box-sizing: border-box;
width: 100%;

@include sticky-top();
@include mixins.sticky-top();
}

&__controls {
Expand All @@ -23,8 +23,8 @@
width: max-content;
height: 62px;

@include controls();
@include sticky-top();
@include mixins.controls();
@include mixins.sticky-top();
}

&__table {
Expand Down
4 changes: 2 additions & 2 deletions src/components/User/User.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.kv-user {
display: inline-block;

color: var(--g-color-text-primary);
@include body-2-typography();
@include mixins.body-2-typography();

&__name {
display: inline-block;
Expand Down
6 changes: 3 additions & 3 deletions src/components/YDBDefinitionList/YDBDefinitionList.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-definition-list {
@include flex-container();
@include mixins.flex-container();

&__title {
@include info-viewer-title();
@include mixins.info-viewer-title();
}

&__properties-list {
Expand Down
11 changes: 6 additions & 5 deletions src/containers/App/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use '../../styles/mixins.scss';

@import url('https://fonts.googleapis.com/css2?family=Rubik&display=swap');
@import '../../styles/mixins.scss';

* {
// FIXME: this is an overkill, potentially could break external components, needs refactoring
Expand Down Expand Up @@ -73,17 +74,17 @@ body,
}

.loader {
@include loader();
@include mixins.loader();
}

.app {
height: 100%;
@include flex-container();
@include data-table-styles();
@include mixins.flex-container();
@include mixins.data-table-styles();

&__main {
overflow: auto;
@include flex-container();
@include mixins.flex-container();
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/containers/Authentication/Authentication.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.authentication {
display: flex;
Expand Down Expand Up @@ -45,7 +45,7 @@
margin: 34px 0 16px;

font-weight: 600;
@include header-2-typography;
@include mixins.header-2-typography;
}

&__form-wrapper {
Expand Down
8 changes: 4 additions & 4 deletions src/containers/Cluster/Cluster.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../styles/mixins.scss';
@use '../../styles/mixins.scss';

.ydb-cluster {
position: relative;
Expand All @@ -18,7 +18,7 @@

&__title {
font-weight: var(--g-text-header-font-weight);
@include header-1-typography();
@include mixins.header-1-typography();
}

&__title-skeleton {
Expand All @@ -36,11 +36,11 @@
padding-left: 20px;

transform: translateX(-20px);
@include sticky-top();
@include mixins.sticky-top();
}
&__tabs {
display: flex;
@include tabs-wrapper-styles();
@include mixins.tabs-wrapper-styles();
}

&__sticky-wrapper {
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Cluster/ClusterDashboard/ClusterDashboard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../styles/mixins.scss';
@use '../../../styles/mixins.scss';

.ydb-cluster-dashboard {
position: sticky;
Expand All @@ -7,7 +7,7 @@
padding-top: 16px;

&__error {
@include body-2-typography();
@include mixins.body-2-typography();
}
&__card {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Cluster/ClusterInfo/ClusterInfo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../styles/mixins';
@use '../../../styles/mixins';

.cluster-info {
padding: 20px 0;
Expand All @@ -8,7 +8,7 @@
}

&__error {
@include body-2-typography();
@include mixins.body-2-typography();
}

&__metrics {
Expand Down
4 changes: 2 additions & 2 deletions src/containers/Cluster/ClusterInfo/components/NodesState/NodesState.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../../styles/mixins.scss';
@use '../../../../../styles/mixins.scss';

.ydb-nodes-state {
display: flex;
Expand All @@ -13,5 +13,5 @@
color: var(--entity-state-font-color);
border-radius: var(--g-spacing-1);
background-color: var(--entity-state-background-color);
@include entity-state-colors();
@include mixins.entity-state-colors();
}
Loading
Loading