@redneckz/wildless-cms-uni-blocks 0.12.10 → 0.12.12

package/src/components/ContactsBlock/ContactsBlock.tsx

@@ -20,7 +20,7 @@ export const ContactsBlock = JSX<ContactsBlockProps>(
   ({ className, contacts, info, version = 'secondary', ...rest }) => (
     <BlockWrapper
       className={style('flex', className)}
-      defaultPadding="p-default"
+      defaultPadding="p-6xl"
       version={version}
       {...rest}
     >
@@ -40,22 +40,22 @@ const renderBlocksColumn = ({ column, index }: RenderContactsColumnProps) =>
   column ? (
     <div className="flex flex-col grow basis-0 pr-11 last:pr-0" key={`col-${String(index)}`}>
       {column.map(({ title = '', description, additionalDescription, button }, key) => (
-        <div className="mt-6 first:mt-0" key={String(key)}>
+        <div className="mt-xl first:mt-0" key={String(key)}>
           <Headline
-            className="!p-0"
             title={title}
             description={description}
             headlineVersion="XS"
             align="text-left"
+            isPadding={false}
           />
           {additionalDescription ? (
-            <div className="mt-1.5 opacity-80">
+            <div className="mt-xs opacity-80">
               <Paragraph size="text-m" font="font-light">
                 {additionalDescription}
               </Paragraph>
             </div>
           ) : null}
-          {button?.href ? <Button className="mt-6" {...button} /> : null}
+          {button?.href ? <Button className="mt-xl" {...button} /> : null}
         </div>
       ))}
     </div>

package/src/components/ContentPage/ContentPage.tsx

@@ -1,14 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { BlockRendererOptions } from '../../BlockRenderer/BlockRendererOptions';
 import { renderBlocksList } from '../../BlockRenderer/renderBlockList';
+import { renderChildren } from '../../BlockRenderer/renderChildren';
 import { useBool } from '../../hooks/useBool';
+import { useLocation } from '../../hooks/useLocation';
+import { useSWRResource } from '../../hooks/useSWRResource';
 import type { BlockDecorator } from '../../model/BlockDecorator';
 import type { BlocksRegistry } from '../../model/BlocksRegistry';
 import type { ContentPageDef } from '../../model/ContentPageDef';
 import type { JSXBlock, UniBlockProps } from '../../model/JSXBlock';
+import { projectSettings } from '../../ProjectSettings';
 import { useBlockRouterProvider } from '../../services/BlockRouter/useBlockRouterProvider';
+import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { CookiePopup } from '../../ui-kit/CookiePopup/CookiePopup';
 import { useDialogHandlers } from '../../ui-kit/Dialog/useDialogHandlers';
+import { LocationDialog } from '../../ui-kit/LocationDialog/LocationDialog';
+import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
 import { style } from '../../utils/style';
 import { LikeControl } from '../LikeControl/LikeControl';
 
@@ -18,64 +25,75 @@ interface ContentPageProps extends UniBlockProps {
   blockDecorator?: BlockDecorator;
 }
 
-export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>((props) => {
-  const { className = '', blocksRegistry, blockDecorator, data = {} } = props;
+export const ContentPage: JSXBlock<ContentPageProps> = JSX<ContentPageProps>(
+  ({ className, blocksRegistry, blockDecorator, data = {} }) => {
+    const { style: pageStyle, slots, likeControl, colorPalette = 'pc' } = data;
 
-  const { style: pageStyle, blocks, slots, likeControl, colorPalette = 'pc' } = data;
+    const options: BlockRendererOptions = {
+      key: '',
+      page: data,
+      blocksRegistry,
+      blockDecorator,
+      parent: data,
+    };
 
-  const options: BlockRendererOptions = {
-    key: '',
-    page: data,
-    blocksRegistry,
-    blockDecorator,
-    parent: data,
-  };
+    const sitemap = useSWRResource<SitemapData>(
+      projectSettings.SITEMAP || 'sitemap',
+      data?.fallback,
+    );
+    const [location, onChangeLocation] = useLocation(sitemap?.defaultLocation);
 
-  useBlockRouterProvider();
+    useBlockRouterProvider();
+    const [isSomeDialogOpened, { setTrue: setSomeDialogOpened, setFalse: resetSomeDialogOpened }] =
+      useBool();
 
-  const [isSomeDialogOpened, { setTrue: setSomeDialogOpened, setFalse: resetSomeDialogOpened }] =
-    useBool();
+    useDialogHandlers({
+      onOpen: setSomeDialogOpened,
+      onClose: resetSomeDialogOpened,
+    });
 
-  useDialogHandlers({
-    onOpen: setSomeDialogOpened,
-    onClose: resetSomeDialogOpened,
-  });
-
-  return (
-    <section
-      className={style(
-        'relative',
-        pageStyle,
-        className,
-        isSomeDialogOpened ? 'overflow-hidden h-screen' : '',
-      )}
-      data-theme={colorPalette}
-    >
-      {slots?.header ? (
-        <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">
-          {renderBlocksList(slots?.header, {
+    return (
+      <section
+        className={style(
+          'relative',
+          pageStyle,
+          className,
+          isSomeDialogOpened ? 'overflow-hidden h-screen' : '',
+        )}
+        data-theme={colorPalette}
+      >
+        {slots?.header ? (
+          <div className="mb-5 shadow-[0_8px_32px_0px_#00000014]">
+            {renderBlocksList(slots?.header, {
+              ...options,
+              slotName: 'header',
+              extraProps: { sitemap, location },
+            })}
+          </div>
+        ) : null}
+        <div className="container grid grid-cols-12 gap-1">
+          {renderChildren({ block: data, options, extraProps: { className: 'scroll-mt-12' } })}
+          {renderBlocksList(slots?.footer, {
             ...options,
-            slotName: 'header',
+            slotName: 'footer',
+            extraProps: { sitemap, location },
           })}
         </div>
-      ) : null}
-      <div className="container grid grid-cols-12 gap-1">
-        {renderBlocksList(blocks, options)}
-        {slots?.footer
-          ? renderBlocksList(slots?.footer, {
-              ...options,
-              slotName: 'footer',
-            })
-          : null}
-      </div>
-      {likeControl ? renderLikeControl() : null}
-      <CookiePopup
-        termLink={{ href: '/pd-policy#cookie', target: '_blank' }}
-        personalDataPolicyLink={{ href: '/pd-policy', target: '_blank' }}
-      />
-    </section>
-  );
-});
+        {likeControl ? renderLikeControl() : null}
+        <CookiePopup
+          termLink={{ href: '/pd-policy#cookie', target: '_blank' }}
+          personalDataPolicyLink={{ href: '/pd-policy', target: '_blank' }}
+        />
+        <SearchDialog topItems={sitemap?.topItems} />
+        <LocationDialog
+          currentLocation={location}
+          foreignOffices={sitemap?.foreignOffices}
+          onChangeLocation={onChangeLocation}
+        />
+      </section>
+    );
+  },
+);
 
 ContentPage.childrenTypes = [];
 ContentPage.slots = () => ['header', 'footer'];
@@ -83,7 +101,7 @@ ContentPage.slots = () => ['header', 'footer'];
 function renderLikeControl() {
   return (
     <div className="flex items-end absolute bottom-0 right-0 h-full pointer-events-none">
-      <LikeControl className="rounded-tl-lg sticky bottom-0 pointer-events-auto" />
+      <LikeControl className="rounded-tl-3xl sticky bottom-0 pointer-events-auto" />
     </div>
   );
 }

package/src/components/ExchangeRateOffice/ExchangeRateOffice.tsx

@@ -15,20 +15,20 @@ export const ExchangeRateOffice = JSX<ExchangeRateOfficeProps>(
     const fourRates: CurrencyInformation[] = topNRates(currencies, 4);
 
     return (
-      <BlockWrapper className={className} {...rest}>
-        <div className="flex flex-row flex-grow-0 justify-between mb-8">
+      <BlockWrapper className={style('space-y-3xl', className)} {...rest}>
+        <div className="flex flex-row flex-grow-0 justify-between space-y-lg">
           <Heading
             headingType="h4"
             title={'Курс обмена валют в ' + officeName}
-            className="whitespace-pre-wrap text-h4 mb-5"
+            className="whitespace-pre-wrap text-h4"
           />
-          <div className="pl-11">
+          <div className="pl-6xl">
             <Text size="text-m" font="font-light" align="text-left" color="text-secondary-text">
               {actuality}
             </Text>
           </div>
         </div>
-        <div className="flex flex-row pt-4 text-left">
+        <div className="flex flex-row pt-m text-left">
           {fourRates.length > 0 ? (
             <table className={style('h-fit w-fit', className)}>
               <thead>

package/src/components/ExchangeRateOffice/renderCurrencies.tsx

@@ -29,7 +29,7 @@ export const renderCurrencyRow = ({
           {title ? (
             <Img image={{ icon: CURRENCY_ICONS_MAP[title] }} width="24" height="24" />
           ) : null}
-          <span className="ml-2">{title}</span>
+          <span className="ml-xs">{title}</span>
         </div>
       </td>
       {renderCurrency(buyPrice, buyDifference)}
@@ -44,7 +44,7 @@ const formatCurrency = (value?: number) => (value ? currencyNumberFormat.format(
 
 const renderCurrency = (price?: number, difference?: number) => {
   return (
-    <td className="pt-4 pl-11">
+    <td className="pt-m pl-5xl">
       <div>{formatCurrency(price)}</div>
       <div
         className={style(
@@ -60,7 +60,7 @@ const renderCurrency = (price?: number, difference?: number) => {
 
 const renderOffice = (price?: number, officeName = '') => {
   return (
-    <td className="pt-4 pl-11">
+    <td className="pt-m pl-5xl">
       <div>{formatCurrency(price)}</div>
       <div className="font-normal text-sm text-green">{officeName}</div>
     </td>

package/src/components/ExchangeRateOffice/renderTableHeader.tsx

@@ -2,7 +2,7 @@ import { Text } from '../../ui-kit/Text/Text';
 
 export const renderTableHeader = (title: string) => {
   return (
-    <th className="pl-11">
+    <th className="pl-5xl">
       <Text size="text-m" font="font-light" align="text-left" color="text-secondary-text">
         {title}
       </Text>

package/src/components/ExchangeRateTile/CurrencyTable.tsx

@@ -1,10 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { Img } from '../../ui-kit/Img/Img';
+import { Text } from '../../ui-kit/Text/Text';
 import type { ExchangeCurrencyItem } from './ExchangeCurrencyCalculator';
 import { formatCurrency } from './formatCurrency';
 
 const TABLE_HEAD_STYLE = 'text-left text-m font-light text-secondary-text';
-const TABLE_HEAD_STYLE_WITH_PL = `${TABLE_HEAD_STYLE} pl-11`;
+const TABLE_HEAD_STYLE_WITH_PADDING = `${TABLE_HEAD_STYLE} pl-5xl`;
 
 const CURRENCY_ICONS_MAP = {
   USD: 'DollarIcon',
@@ -20,9 +21,15 @@ export const CurrencyTable = JSX<CurrencyTableProps>(({ className, exchangeCurre
   <table className={`h-fit w-fit ${className}`}>
     <thead>
       <tr>
-        <th className={TABLE_HEAD_STYLE}>Валюта</th>
-        <th className={TABLE_HEAD_STYLE_WITH_PL}>Купить</th>
-        <th className={TABLE_HEAD_STYLE_WITH_PL}>Продать</th>
+        <th className={TABLE_HEAD_STYLE}>
+          <Text size="text-m">Валюта</Text>
+        </th>
+        <th className={TABLE_HEAD_STYLE_WITH_PADDING}>
+          <Text size="text-m">Купить</Text>
+        </th>
+        <th className={TABLE_HEAD_STYLE_WITH_PADDING}>
+          <Text size="text-m">Продать</Text>
+        </th>
       </tr>
     </thead>
     <tbody>{exchangeCurrencyItems.map(renderCurrencyRow)}</tbody>
@@ -33,17 +40,26 @@ const renderCurrencyRow = (exchangeCurrencyItem: ExchangeCurrencyItem) => {
   const currency = exchangeCurrencyItem?.currency?.currency;
 
   return (
-    <tr key={currency} className="pb-1 text-h6">
-      <td className="pt-4">
+    <tr key={currency} className="pb-2xs text-h6">
+      <td className="pt-m">
         <div className="flex items-center">
           {currency ? (
-            <Img image={{ icon: CURRENCY_ICONS_MAP[currency] }} width="24" height="24" />
+            <Img
+              image={{ icon: CURRENCY_ICONS_MAP[currency] }}
+              width="24"
+              height="24"
+              className="mr-2"
+            />
           ) : null}
-          <span className="ml-2">{currency}</span>
+          <Text size="text-h6">{currency}</Text>
         </div>
       </td>
-      <td className="pt-4 pl-11">{formatCurrency(exchangeCurrencyItem?.saleExchangeRate)}</td>
-      <td className="pt-4 pl-11">{formatCurrency(exchangeCurrencyItem?.buyExchangeRate)}</td>
+      <td className="pt-m pl-5xl">
+        <Text size="text-h6">{formatCurrency(exchangeCurrencyItem?.saleExchangeRate)}</Text>
+      </td>
+      <td className="pt-m pl-5xl">
+        <Text size="text-h6">{formatCurrency(exchangeCurrencyItem?.buyExchangeRate)}</Text>
+      </td>
     </tr>
   );
 };

package/src/components/ExchangeRateTile/CurrentLocation.tsx

@@ -1,17 +1,20 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Img } from '../../ui-kit/Img/Img';
+import { Picture } from '../../model/Picture';
+import { RoundedIcon } from '../../ui-kit/Icon/RoundedIcon';
 
 interface CurrentLocationProps {
   className?: string;
   address?: string;
 }
 
+const icon: Picture = { icon: 'GpsIcon' };
+
 export const CurrentLocation = JSX<CurrentLocationProps>(({ className = '', address }) => (
-  <div className={`flex ${className}`}>
-    <Img image={{ icon: 'GpsIcon' }} width="24" height="24" />
-    <div className="ml-3">
-      {address ? <p className="text-primary-main  m-0 mb-1 text-l">{address}</p> : null}
-      <p className="text-secondary-text m-0 text-m">Курс указан для заданного офиса</p>
+  <div className={`flex gap-s ${className}`}>
+    <RoundedIcon {...icon} iconBgVersion="primary" />
+    <div className="space-y-2xs">
+      {address ? <p className="text-primary-main text-l">{address}</p> : null}
+      <p className="text-secondary-text text-m">Курс указан для заданного офиса</p>
     </div>
   </div>
 ));

package/src/components/ExchangeRateTile/ExchangeCurrencyCalculator.tsx

@@ -44,7 +44,7 @@ export const ExchangeCurrencyCalculator = JSX<ExchangeCurrencyCalculatorProps>(
     );
 
     return (
-      <div className={`grid gap-[18px] pt-2 ${className}`}>
+      <div className={`grid gap-m pt-2xl ${className}`}>
         {renderInput({
           placeholder: 'Хочу продать',
           rates: currencyRatesSell,

package/src/components/ExchangeRateTile/ExchangeRateTile.fixture.mobile.tsx

@@ -0,0 +1,19 @@
+import '../../setup-fixture';
+
+import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import { ExchangeRateTile } from './ExchangeRateTile';
+
+const button: ButtonProps = {
+  href: 'https://coins.rshb.ru/exchange',
+  text: 'Купить валюту',
+  target: '_blank',
+  version: 'primary',
+};
+
+export default {
+  default: (
+    <div className="container grid grid-cols-12">
+      <ExchangeRateTile button={button} className="col-span-12" />
+    </div>
+  ),
+};

package/src/components/ExchangeRateTile/ExchangeRateTile.tsx

@@ -31,7 +31,7 @@ export const ExchangeRateTile = JSX<ExchangeRateTileProps>(
           className="h-full"
           title={<Heading headingType="h4" title={title} className="whitespace-pre-wrap" />}
         >
-          <div className="flex gap-xxl">
+          <div className="flex gap-6xl flex-wrap">
             <div>
               {currencyRates ? (
                 <CurrencyTable className="mb-xl" exchangeCurrencyItems={currencyRates} />

package/src/components/Footer/Contacts.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { Button } from '../../ui-kit/Button/Button';
 import { Text } from '../../ui-kit/Text/Text';
 import type { ContactGroup, ContactInfo } from './FooterContent';
+import { style } from '../../utils/style';
 
 export interface ContactsProps {
   className?: string;
@@ -10,7 +11,7 @@ export interface ContactsProps {
 }
 
 export const Contacts = JSX<ContactsProps>(({ className = '', items, hasButton }) => (
-  <div className={className}>
+  <div className={style('space-y-xl', className)}>
     {items?.length ? items.map(renderContactsGroup) : null}
     {hasButton ? (
       <Button
@@ -26,20 +27,20 @@ export const Contacts = JSX<ContactsProps>(({ className = '', items, hasButton }
 ));
 
 const renderContactsGroup = (item: ContactGroup, i: number) => (
-  <div className="mb-6" key={String(i)}>
-    <div className="mb-4">
+  <div className="space-y-m" key={String(i)}>
+    <div className="">
       <Text size="text-l" font="font-medium">
         {item?.title}
       </Text>
     </div>
-    <div>{item.items?.map(renderContact)}</div>
+    <div className="space-y-m">{item.items?.map(renderContact)}</div>
   </div>
 );
 
 const renderContact = (item: ContactInfo, index: number) => (
-  <div className="mb-4" key={String(index)}>
+  <div className="space-y-2xs" key={String(index)}>
     <div>{renderText(item.type, item.text)}</div>
-    <div className="mt-1 text-s font-light text-secondary-text">{item.description}</div>
+    <div className="text-s font-light text-secondary-text">{item.description}</div>
   </div>
 );
 

package/src/components/Footer/Footer.fixture.mobile.tsx

@@ -1,11 +1,13 @@
 import '../../setup-fixture';
 
+import type { SitemapData } from '../../services/sitemap/SitemapData';
+import sitemap from '../Header/sitemap.wcms-resource.json';
 import { Footer } from './Footer';
 
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <Footer className="col-span-12" />
+      <Footer className="col-span-12" sitemap={sitemap as SitemapData} />
     </div>
   ),
 };

package/src/components/Footer/Footer.fixture.tsx

@@ -1,28 +1,15 @@
 import '../../setup-fixture';
 
+import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { SearchDialog } from '../../ui-kit/SearchDialog/SearchDialog';
+import sitemap from '../Header/sitemap.wcms-resource.json';
 import { Footer } from './Footer';
 
-const topItems = [
-  {
-    href: '/natural',
-    text: 'Частным клиентам',
-  },
-  {
-    text: 'Бизнес клиентам',
-    href: '/business',
-  },
-  {
-    text: 'Экосистема Своё',
-    href: '/svoe',
-  },
-];
-
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <Footer className="col-span-12" />
-      <SearchDialog topItems={topItems} />
+      <Footer className="col-span-12" sitemap={sitemap as SitemapData} />
+      <SearchDialog topItems={(sitemap as SitemapData).topItems} />
     </div>
   ),
 };

package/src/components/Footer/Footer.mobile.tsx

@@ -1,34 +1,30 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useSWRResource } from '../../hooks/useSWRResource';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { LinkCommonProps } from '../../model/LinkProps';
 import { projectSettings } from '../../ProjectSettings';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Button } from '../../ui-kit/Button/Button';
 import { LinkList } from '../../ui-kit/LinkList/LinkList';
 import { RollupItem } from '../RollupItem/RollupItem';
 import { Contacts } from './Contacts';
 import { findIconByHref } from './findIconByHref';
-import type { FooterContent } from './FooterContent';
 import type { FooterDataProps } from './FooterDataProps';
+import type { FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
 
-export interface FooterProps extends FooterContent, UniBlockProps {}
-
-export const Footer = JSX<FooterProps>(({ className = '', ...rest }) => {
-  const fallback = rest.options?.page?.fallback;
-
-  const sitemap = useSWRResource<SitemapData>(projectSettings.SITEMAP || 'sitemap', fallback);
+export const Footer = JSX<FooterProps>(({ className, sitemap, ...rest }) => {
   const { relatedEnterprises, contacts, socialMedia, mobileApps, horizontalNavigationTitle } =
-    useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
+    useSWRResource<FooterDataProps>(
+      projectSettings.FOOTER || 'footer',
+      rest.options?.page?.fallback,
+    );
 
   return (
     <BlockWrapper tag="footer" className={className} defaultPadding="px-4 py-6" {...rest}>
       <div className="mb-4 pb-5 border-b border-main-divider">
-        {sitemap.topItems?.map((item, i) => (
+        {sitemap?.topItems?.map((item, i) => (
           <RollupItem key={String(i)} label={item?.text} labelIcon={item?.icon}>
             <LinkList items={item.items} className="my-3" />
           </RollupItem>
@@ -38,7 +34,7 @@ export const Footer = JSX<FooterProps>(({ className = '', ...rest }) => {
       <SocialMedia className="mb-4" media={socialMedia} />
       {mobileApps?.map(renderButton)}
       <HorizontalNavigation
-        className="pt-4 pb-7 border-y border-main-divider"
+        className="pt-m pb-2xl border-y border-main-divider"
         title={horizontalNavigationTitle}
         links={relatedEnterprises}
       />

package/src/components/Footer/Footer.tsx

@@ -1,47 +1,43 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useSWRResource } from '../../hooks/useSWRResource';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { projectSettings } from '../../ProjectSettings';
-import type { SitemapData } from '../../services/sitemap/SitemapData';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Logo } from '../../ui-kit/Logo/Logo';
 import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
 import { Sitemap } from '../../ui-kit/Sitemap/Sitemap';
 import { Contacts } from './Contacts';
-import type { FooterContent } from './FooterContent';
 import type { FooterDataProps } from './FooterDataProps';
+import type { FooterProps } from './FooterProps';
 import { HorizontalNavigation } from './HorizontalNavigation';
 import { SocialMedia } from './SocialMedia';
 import { TextInformation } from './TextInformation';
 
 const LEFT_COL_WIDTH_FULL_HD = 'w-[204px]';
 
-export interface FooterProps extends FooterContent, UniBlockProps {}
-
-export const Footer = JSX<FooterProps>(({ className = '', ...rest }) => {
-  const fallback = rest.options?.page?.fallback;
-
-  const sitemap = useSWRResource<SitemapData>(projectSettings.SITEMAP || 'sitemap', fallback);
+export const Footer = JSX<FooterProps>(({ className, sitemap, ...rest }) => {
   const { documents, relatedEnterprises, contacts, socialMedia, mobileApps, logo } =
-    useSWRResource<FooterDataProps>(projectSettings.FOOTER || 'footer', fallback);
+    useSWRResource<FooterDataProps>(
+      projectSettings.FOOTER || 'footer',
+      rest.options?.page?.fallback,
+    );
 
   return (
     <BlockWrapper tag="footer" className={className} {...rest}>
-      <div className="flex items-stretch gap-[54px] pb-8 xl:gap-8">
+      <div className="flex items-stretch gap-6xl xl:gap-3xl pb-3xl ">
         <Logo className={LEFT_COL_WIDTH_FULL_HD} logo={logo} />
         <SearchBar className="grow" />
       </div>
-      <div className="flex items-stretch gap-[54px] xl:gap-8">
-        <div className={`${LEFT_COL_WIDTH_FULL_HD} flex flex-col shrink-0 overflow-hidden`}>
+      <div className="flex items-stretch gap-6xl xl:gap-3xl">
+        <div
+          className={`${LEFT_COL_WIDTH_FULL_HD} flex flex-col shrink-0 overflow-hidden space-y-xl`}
+        >
           <Contacts items={contacts} hasButton />
           <SocialMedia media={socialMedia}>Соцсети</SocialMedia>
-          <SocialMedia className="mt-6" media={mobileApps}>
-            Мобильное приложение
-          </SocialMedia>
+          <SocialMedia media={mobileApps}>Мобильное приложение</SocialMedia>
         </div>
         <Sitemap className="flex-grow" topItems={sitemap?.topItems} />
       </div>
-      <HorizontalNavigation className="mt-[98px]" links={relatedEnterprises} />
+      <HorizontalNavigation className="mt-24" links={relatedEnterprises} />
       <TextInformation links={documents} />
     </BlockWrapper>
   );

package/src/components/Footer/FooterProps.ts

@@ -0,0 +1,7 @@
+import type { UniBlockProps } from '../../model/JSXBlock';
+import type { SitemapData } from '../../services/sitemap/SitemapData';
+import type { FooterContent } from './FooterContent';
+
+export interface FooterProps extends FooterContent, UniBlockProps {
+  sitemap?: SitemapData;
+}

package/src/components/GracePeriod/GracePeriod.tsx

@@ -13,8 +13,14 @@ export interface GracePeriodProps extends GracePeriodContent, UniBlockProps {}
 
 export const GracePeriod = JSX<GracePeriodProps>(
   ({ className = '', title, description, calendar, ...rest }) => (
-    <BlockWrapper className={className} defaultPadding="p-default" {...rest}>
-      <Headline className="!p-0 mb-4" title={title} description={description} headlineVersion="M" />
+    <BlockWrapper className={className} defaultPadding="p-6xl" {...rest}>
+      <Headline
+        className="mb-4"
+        title={title}
+        description={description}
+        headlineVersion="M"
+        isPadding={false}
+      />
       {calendar ? renderCalendar(calendar) : null}
     </BlockWrapper>
   ),
@@ -42,15 +48,15 @@ const renderCalendar = (calendar: CalendarItem[]) => {
       <div className="flex w-full mb-3 text-h6 text-center">
         {mappedCalendar.map((_) => renderMonthNames(_, colSize))}
       </div>
-      <div className="flex w-full">
+      <div className="flex gap-s w-full">
         {mappedCalendar.map((_, ind) => (
           <div
             key={`monthItem-${ind}`}
-            className="pr-[11px] mr-3 border-r border-main-divider last:border-r-0 last:pr-0 last:mr-0"
+            className="pr-s border-r border-main-divider last:border-r-0 last:pr-0"
             style={{ flexBasis: _.flexBasis }}
           >
             <div className="flex">{renderMonthImages(_)}</div>
-            <div className="text-s font-light text-primary-text mt-3">
+            <div className="text-s font-light text-primary-text mt-s">
               <span>{_.text}</span>&thinsp;
               <span className="text-primary-main">{_.greenText}</span>
             </div>