Skip to content

WIP: feat!: tokenization from gravity project #1493

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

Open
NikitaCG wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: feat!: tokenization from gravity project #1493

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
2 changes: 0 additions & 2 deletions src/blocks/ContentLayout/ContentLayout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@ $block: '.#{$ns}content-layout-block';
margin-top: $indentSM;

&_size_s {
@extend %heading-margin-reset;
@include text-size(body-2);
}

&_size_l,
&_size_xl {
@extend %heading-margin-reset;
@include text-size(body-3);
}

Expand Down
8 changes: 6 additions & 2 deletions src/blocks/ExtendedFeatures/ExtendedFeatures.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@ $block: '.#{$ns}ExtendedFeaturesBlock';
margin: inherit;
display: block;
margin-block: 0 $indentXXXS;
@include heading4();
@include text-header-1();

color: var(--pc-text-header-color);
}

&-title {
@include add-specificity(&) {
@include heading4();
@include text-header-1();

color: var(--pc-text-header-color);
margin: 0;
position: relative;
margin-bottom: $indentXXXS;

Expand Down
4 changes: 3 additions & 1 deletion src/blocks/FoldableList/FoldableListBlockItem/FoldableListBlockItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ $block: '.#{$ns}FoldableListBlockItem';

&__title {
@include add-specificity(&) {
@include heading4();
@include text-header-1();
@include focusable();

color: var(--pc-text-header-color);
margin: 0;
cursor: pointer;
border-radius: var(--g-focus-border-radius);

Expand Down
12 changes: 11 additions & 1 deletion src/blocks/Header/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,20 @@ $backgroundWidth: 1440px;

&__title {
@include add-specificity(&) {
@include heading1();
@include text-display-4();

color: var(--pc-text-header-color);
margin: 0;
position: relative;

@media (max-width: map-get($gridBreakpoints, 'md')) {
@include text-display-3();
}

@media (max-width: map-get($gridBreakpoints, 'sm')) {
@include text-display-2();
}

a {
@include link();
}
Expand Down
5 changes: 4 additions & 1 deletion src/blocks/PromoFeaturesBlock/PromoFeaturesBlock.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ $block: '.#{$ns}PromoFeaturesBlock';
$class: &;

&__card-title {
@include heading4();
@include text-header-1();

color: var(--pc-text-header-color);
margin: 0;
}

&__card-container {
Expand Down
4 changes: 3 additions & 1 deletion src/blocks/Questions/QuestionBlockItem/QuestionBlockItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ $block: '.#{$ns}QuestionsBlockItem';

&__title {
@include add-specificity(&) {
@include heading4();
@include text-header-1();
@include focusable();

color: var(--pc-text-header-color);
margin: 0;
cursor: pointer;
border-radius: var(--g-focus-border-radius);

Expand Down
5 changes: 3 additions & 2 deletions src/blocks/Share/Share.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ $block: '.#{$ns}share-block';
#{$block} {
&__title {
@include add-specificity(&) {
@include heading5();
@include text-body-3();

color: var(--pc-text-header-color);
margin: 0;
text-align: center;
font-weight: normal;
}
}

Expand Down
8 changes: 7 additions & 1 deletion src/blocks/Table/Table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ $block: '.#{$ns}table-block';

&__title {
@include add-specificity(&) {
@include heading2();
@include text-display-2();
@include top-content-offset($offset: 0px);

color: var(--pc-text-header-color);
margin: 0;
position: sticky;
margin-right: $indentM;

@media (max-width: map-get($gridBreakpoints, 'sm') - 1) {
@include text-display-1();
}
}
}

Expand Down
34 changes: 26 additions & 8 deletions src/components/Title/TitleItem.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,49 @@ $block: '.#{$ns}title-item';
@include justify();
$root: &;

color: var(--pc-text-header-color);
margin: 0;

&_size_xs {
@include heading5();
@include text-subheader-3();
}

&_size_s {
@include heading4();
@include text-header-1();
margin-top: $indentM;
}

&_size_sm {
@include heading(display-1);
@include text-display-1();
margin-top: $indentL;
}

&_size_m {
@include heading2();
@include text-display-2();
margin-top: $indentL;

@media (max-width: map-get($gridBreakpoints, 'sm') - 1) {
@include text-display-1();
}
}

&_size_l {
@include heading1();
@include text-display-4();
margin-top: $indentXXL;

@media (max-width: map-get($gridBreakpoints, 'md')) {
@include text-display-3();
}

@media (max-width: map-get($gridBreakpoints, 'sm')) {
@include text-display-2();
}
}

&__arrow {
position: relative;
left: 0;
transition: left 0.3s $ease-out-cubic;
margin-top: 9px;

&_size_xs {
Expand All @@ -56,14 +74,14 @@ $block: '.#{$ns}title-item';
cursor: pointer;

#{$root}__arrow {
margin-left: 10px;
left: 10px;

&_size_xs {
margin-left: 6px;
left: 6px;
}

&_size_s {
margin-left: 8px;
left: 8px;
}
}
}
Expand Down
8 changes: 7 additions & 1 deletion src/containers/PageConstructor/__stories__/components/CustomDecorator/CustomDecorator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,16 @@
padding: 24px 48px;

&-title {
@include heading2();
@include text-display-2();

color: var(--pc-text-header-color);
margin: 0;
width: fit-content;
margin-bottom: 24px;

@media (max-width: map-get($gridBreakpoints, 'sm') - 1) {
@include text-display-1();
}
}

&-content {
Expand Down
3 changes: 2 additions & 1 deletion src/navigation/components/Logo/Logo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ $block: '.#{$ns}logo';
}

&__text {
@include heading4();
@include text-header-1();

color: var(--pc-text-header-color);
white-space: nowrap;
}
}
19 changes: 11 additions & 8 deletions src/sub-blocks/BannerCard/BannerCard.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

$block: '.#{$ns}banner-card';

@mixin subtitle {
@include heading5();
font-weight: normal;
}

#{$block} {
$class: &;
$borderRadius: $borderRadius;
Expand All @@ -33,7 +28,13 @@ $block: '.#{$ns}banner-card';

&__title {
@include add-specificity(&) {
@include heading2();
@include text-display-2();

margin: 0;

@media (max-width: map-get($gridBreakpoints, 'sm') - 1) {
@include text-display-1();
}

a {
@include link();
Expand Down Expand Up @@ -65,12 +66,14 @@ $block: '.#{$ns}banner-card';

&__subtitle {
@include add-specificity(&) {
@include text-body-3();

display: inline-block;
margin-top: $indentXXXS;
@include subtitle();

& p {
@include subtitle();
@include text-body-3();
margin: 0;
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/sub-blocks/Content/Content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,14 @@ $darkSecondary: var(--g-color-text-dark-secondary);

#{$block}__text .yfm,
#{$block}__notice .yfm {
@extend %heading-margin-reset;
margin: 0;
@include text-size(body-3);
}
#{$block}__text .yfm {
@include text-size(body-3);
}
#{$block}__notice .yfm {
@extend %heading-margin-reset;
margin: 0;
@include text-size(body-2);
}

Expand Down Expand Up @@ -154,15 +154,15 @@ $darkSecondary: var(--g-color-text-dark-secondary);

#{$block}__text .yfm,
#{$block}__notice .yfm {
@extend %heading-margin-reset;
margin: 0;
@include text-size(body-3);
}
#{$block}__text .yfm {
@include text-size(body-3);
}

#{$block}__notice .yfm {
@extend %heading-margin-reset;
margin: 0;
@include text-size(body-2);
}

Expand Down Expand Up @@ -190,15 +190,15 @@ $darkSecondary: var(--g-color-text-dark-secondary);

#{$block}__text .yfm,
#{$block}__notice .yfm {
@extend %heading-margin-reset;
margin: 0;
@include text-size(body-3);
}
#{$block}__text .yfm {
@include text-size(body-3);
}

#{$block}__notice .yfm {
@extend %heading-margin-reset;
margin: 0;
@include text-size(body-2);
}

Expand Down
48 changes: 0 additions & 48 deletions styles/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,54 +414,6 @@
}
}

//typografy
%heading-margin-reset {
margin: 0;
}

@mixin heading($name) {
@include text-size($name);
color: var(--pc-text-header-color);
@extend %heading-margin-reset;
@include text-accent();
}

@mixin heading1 {
@include heading(display-4);

@media (max-width: map-get($gridBreakpoints, 'md')) {
@include text-size(display-3);
}

@media (max-width: map-get($gridBreakpoints, 'sm')) {
@include text-size(display-2);
}
}

@mixin heading2 {
@include heading(display-2);

@media (max-width: map-get($gridBreakpoints, 'sm') - 1) {
@include text-size(display-1);
}
}

@mixin heading3 {
@include heading(header-2);
}

@mixin heading4 {
@include heading(header-1);
}

@mixin heading5 {
@include heading(body-3);
}

@mixin heading6 {
@include heading(body-3);
}

@mixin paragraph {
margin: 0 0 20px;

Expand Down
Loading