@redocly/theme 0.18.2 → 0.18.3-patch.1

package/src/components/Filter/FilterPopover.tsx

@@ -0,0 +1,140 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Filter, FilterControls } from '@theme';
+
+import { FilterContent, FilterItems } from '@theme/components/Filter/FilterContent';
+import { useTranslate } from '@portal/hooks';
+import type { ResolvedFilter } from '@theme/types/portal/src/shared/types/catalog';
+
+interface FilterPopoverProps {
+  setIsAddingFilter: (value: boolean) => void;
+  filters: ResolvedFilter[];
+}
+
+export function FilterPopover({ setIsAddingFilter, filters }: FilterPopoverProps) {
+  const [filterTerm, setFilterTerm] = React.useState('');
+  const filteredFilters = filters
+    .map((filter) => {
+      const options = filter.options.filter((option) => option.value.includes(filterTerm));
+      return options.length
+        ? {
+            ...filter,
+            filteredOptions: options,
+          }
+        : null;
+    })
+    .filter(Boolean) as ResolvedFilter[];
+
+  const translationKeys = {
+    placeholder: 'theme.catalog.filters.placeholder',
+    done: 'theme.catalog.filters.done',
+  };
+  const { translate } = useTranslate();
+
+  return (
+    <FilterPopoverWrapper>
+      <FilterPopoverHeader>
+        <FilterPopoverHeaderLabel>Add Filter</FilterPopoverHeaderLabel>
+        <FilterPopoverHeaderButton onClick={() => setIsAddingFilter(false)}>
+          {translate(translationKeys.placeholder, 'Done')}
+        </FilterPopoverHeaderButton>
+      </FilterPopoverHeader>
+      <FilterContent
+        setFilterTerm={setFilterTerm}
+        filters={filters}
+        filterTerm={filterTerm}
+        isMobile
+      />
+      <FilterControls>
+        <StyledInput
+          placeholder={translate(translationKeys.placeholder, 'Type to filter...')}
+          value={filterTerm}
+          onChange={(e) => setFilterTerm(e.target.value)}
+        />
+      </FilterControls>
+      <FilterItems>
+        {filteredFilters.map((filter, idx) => (
+          <Filter filter={filter} key={filter.property + '-' + idx} />
+        ))}
+      </FilterItems>
+    </FilterPopoverWrapper>
+  );
+}
+
+const FilterPopoverWrapper = styled.aside<{ isActiveInMobileMode?: boolean }>`
+  position: absolute;
+  top: 0;
+  z-index: var(--z-index-popover);
+  height: 100vh;
+  overflow: auto;
+  transition: height 0.2s ease-in-out;
+  width: 100%;
+  background-color: var(--filter-popover-background-color);
+  display: block;
+
+  ${({ theme }) => theme.mediaQueries.small} {
+    display: none;
+  }
+`;
+
+const FilterPopoverHeader = styled.div`
+  height: var(--navbar-height);
+  padding: var(--filter-popover-header-padding);
+  display: grid;
+  align-items: center;
+  grid-template-columns: 1fr 1fr 1fr;
+  border-bottom: 1px solid var(--filter-popover-header-border-color);
+  background-color: var(--filter-popover-header-background-color);
+`;
+
+const FilterPopoverHeaderLabel = styled.div`
+  color: var(--filter-popover-header-label-color);
+  justify-self: center;
+  grid-column-start: 2;
+  font-size: var(--filter-popover-header-label-font-size);
+  font-weight: var(--filter-popover-header-label-font-weight);
+`;
+
+const FilterPopoverHeaderButton = styled.div.attrs({
+  'data-cy': 'FilterPopover/DoneButton',
+})`
+  color: var(--filter-popover-header-button-color);
+  justify-self: end;
+  font-size: var(--filter-popover-header-button-font-size);
+  font-weight: var(--filter-popover-header-button-font-weight);
+  height: var(--filter-popover-header-button-height);
+  line-height: var(--filter-popover-header-button-height);
+`;
+
+export const StyledInput = styled.input.attrs({ 'data-cy': 'FilterPopover/Input' })`
+  border: var(--filter-input-border);
+  min-width: var(--filter-input-min-width);
+  width: 100%;
+  outline: none;
+  padding: var(--filter-input-padding);
+  border-radius: var(--filter-input-border-radius);
+  background-color: var(--filter-input-background-color);
+  color: var(--filter-input-color);
+  font-family: var(--filter-input-font-family);
+  font-size: var(--filter-input-font-size);
+  line-height: var(--filter-input-line-height);
+
+  &::placeholder {
+    opacity: var(--filter-input-placeholder-opacity);
+    color: var(--filter-input-placeholder-color);
+  }
+
+  &:hover {
+    color: var(--filter-input-hover-color);
+    border: var(--filter-input-hover-border);
+  }
+
+  &:focus {
+    color: var(--filter-input-focus-color);
+    border: var(--filter-input-focus-border);
+  }
+
+  &:-webkit-autofill {
+    background-color: var(--filter-input-background-color);
+  }
+`;

package/src/components/Filter/FilterTag.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import { ClearIcon } from '@theme/components/Search/ClearIcon';
+
+interface FilterTagProps {
+  label: string;
+  onClick: () => void;
+}
+
+export function FilterTag({ label, onClick }: FilterTagProps) {
+  return (
+    <TagWrapper onClick={onClick}>
+      <TagLabel>{label}</TagLabel>
+      <ClearIcon />
+    </TagWrapper>
+  );
+}
+
+const TagWrapper = styled.div.attrs({ 'data-cy': 'Filter/FilterTag' })`
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+  cursor: pointer;
+  color: var(--filter-tag-color);
+  border-radius: var(--filter-tag-border-radius);
+  border: 1px solid var(--filter-tag-border-color);
+  background-color: var(--filter-tag-background-color);
+  padding: var(--filter-tag-padding);
+  font-size: var(--filter-tag-font-size);
+  font-weight: var(--filter-tag-font-weight);
+  margin: var(--filter-tag-margin);
+`;
+
+const TagLabel = styled.div`
+  margin: var(--filter-tag-label-margin);
+`;

package/src/components/Filter/FilterTags.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import type { ResolvedFilter } from '@theme/types/portal/src/shared/types/catalog';
+import { FilterTag } from '@theme/components/Filter/FilterTag';
+
+interface FilterTagsProps {
+  filters: ResolvedFilter[];
+}
+
+export function FilterTags({ filters }: FilterTagsProps) {
+  const selectedFilters: { filter: ResolvedFilter; selectedOption: string }[] = [];
+  filters.forEach((filter: ResolvedFilter & { selectedOptions: any }) => {
+    if (filter.selectedOptions?.size) {
+      for (let selectedOption of filter.selectedOptions) {
+        selectedFilters.push({
+          filter,
+          selectedOption,
+        });
+      }
+    }
+  });
+
+  return (
+    <FilterTagsWrapper>
+      {selectedFilters.map(({ filter, selectedOption }) => (
+        <FilterTag
+          key={`${filter.title}: ${selectedOption}`}
+          onClick={() => filter.toggleOption(selectedOption)}
+          label={`${filter.title}: ${selectedOption}`}
+        />
+      ))}
+    </FilterTagsWrapper>
+  );
+}
+
+const FilterTagsWrapper = styled.div`
+  display: flex;
+`;

package/src/components/Filter/index.ts

@@ -1 +1,3 @@
 export * from '@theme/components/Filter/Filter';
+export * from '@theme/components/Filter/FilterContent';
+export * from '@theme/components/Filter/styledVariables';

package/src/components/Filter/styledVariables.ts

@@ -0,0 +1,109 @@
+import { css } from 'styled-components';
+
+export const filter = css`
+  /* === Filter === */
+  /**
+  * @tokens Filters
+  */
+  --filter-group-padding: var(--spacing-base) 0 0 0;
+
+  --filter-title-font-weight: var(--font-weight-bold);
+  --filter-title-font-size: var(--font-size-base);
+  --filter-title-margin: 0 0 var(--spacing-xxs) 0;
+
+  --filter-option-font-weight: var(--font-weight-regular);
+  --filter-option-font-size: var(--font-size-base);
+  --filter-option-margin: var(--spacing-xs) 0 0 0;
+
+  --filter-option-label-font-size: var(--font-size-base);
+  --filter-option-label-font-weight: var(--font-weight-regular);
+  --filter-option-label-margin: 0 var(--spacing-xs) 0 0;
+  --filter-option-label-color: var(--text-secondary);
+
+  --filter-option-count-height: 14px;
+  --filter-option-count-color: var(--text-description);
+  --filter-option-count-font-size: var(--spacing-sm);
+  --filter-option-count-font-weight: var(--font-weight-regular);
+  --filter-option-count-padding: 0px var(--spacing-xxs);
+  --filter-option-count-border-radius: var(--spacing-sm);
+  --filter-option-count-border-color: 1px solid var(--border-secondary);
+  --filter-option-count-background-color: var(--bg-raised);
+
+  --filter-content-border-color: var(--border-secondary);
+  --filter-content-items-padding: 0 var(--mobile-catalog-filter-padding-horizontal);
+  --filter-content-clear-button-margin: var(--spacing-base) auto 0 auto;
+  --filter-content-clear-button-width: calc(var(--spacing-unit) * 40);
+  --filter-controls-background-color: var(--bg-base);
+
+  --filter-popover-background-color: var(--bg-base);
+  --filter-popover-header-padding: var(--mobile-catalog-filter-padding-vertical) var(--mobile-catalog-filter-padding-horizontal);
+  --filter-popover-header-border-color: var(--border-secondary);
+  --filter-popover-header-background-color: var(--navbar-background-color);
+  --filter-popover-header-label-color: var(--navbar-text-color);
+  --filter-popover-header-label-font-size: var(--font-size-lg);
+  --filter-popover-header-label-font-weight: var(--font-weight-bold);
+  --filter-popover-header-button-color: var(--navbar-text-color);
+  --filter-popover-header-button-height: var(--control-height-base);
+  --filter-popover-header-button-font-size: var(--font-size-base);
+  --filter-popover-header-button-font-weight: var(--font-weight-regular);
+
+  --filter-tags-wrapper-padding: var(--spacing-xs) 0 var(--spacing-base) var(--spacing-base);
+  --filter-tag-color: var(--text-primary);
+  --filter-tag-border-radius: var(--spacing-sm);
+  --filter-tag-border-color: var(--border-primary);
+  --filter-tag-background-color: var(--bg-raised);
+  --filter-tag-padding: 0 var(--spacing-xs);
+  --filter-tag-font-size: var(--font-size-sm);
+  --filter-tag-font-weight: var(--font-weight-regular);
+  --filter-tag-margin: 0 var(--spacing-xxs) 0 0;
+  --filter-tag-label-margin: 0 var(--spacing-xxs) 0 0;
+
+  --filter-input-border: 1px solid var(--border-primary);
+  --filter-input-min-width: 200px;
+  --filter-input-padding: var(--input-padding);
+  --filter-input-border-radius: var(--input-border-radius);
+  --filter-input-background-color: var(--input-background-color);
+  --filter-input-color: var(--text-secondary);
+  --filter-input-font-family: var(--font-family-base);
+  --filter-input-font-size: var(--font-size-base);
+  --filter-input-line-height: var(--input-line-height);
+  --filter-input-placeholder-opacity: 0.6;
+  --filter-input-placeholder-color: var(--text-placeholder);
+  --filter-input-hover-color: var(--text-primary);
+  --filter-input-hover-border: 1px solid var(--border-primary);
+  --filter-input-focus-color: var(--text-primary);
+  --filter-input-focus-border: 1px solid var(--border-primary);
+
+  --filter-add-button-margin: 0 var(--spacing-sm) 0 0;
+  --filter-add-button-padding: 0;
+  --filter-add-button-font-size: var(--font-size-base);
+  --filter-add-button-font-weight: var(--font-weight-regular);
+
+  --filter-select-min-height: var(--control-height-base);
+  --filter-select-color: var(--text-primary);
+  --filter-select-border-color: var(--border-primary);
+  --filter-select-border-radius: calc(var(--spacing-unit) * 1.5);
+  --filter-select-padding: 0;
+  --filter-select-hover-border-color: var(--text-primary);
+  --filter-select-option-margin: 0;
+
+  --filter-date-picker-color: var(--text-primary);
+  --filter-date-picker-margin: 0 0 var(--spacing-xxs) 0;
+  --filter-date-picker-gap: var(--spacing-xs);
+  --filter-date-picker-width: 50px;
+  --filter-date-picker-tile-background: var(--color-blue-2);
+  --filter-date-picker-tile-color: var(--text-primary);
+  --filter-date-picker-tile-hover-background: var(--color-blue-3);
+  --filter-date-picker-tile-hover-color: var(--text-primary);
+  --filter-date-picker-input-width: var(--spacing-md);
+  --filter-date-picker-invalid-input-background: var(--bg-raised);
+  --filter-date-picker-button-padding: var(--spacing-xxs);
+  --filter-date-picker-icon-stroke: var(--text-secondary);
+  --filter-date-picker-icon-width: var(--spacing-sm);
+  --filter-date-picker-hover-icon-stroke: var(--text-primary);
+  --filter-date-picker-wrapper-border-color: var(--border-primary);
+  --filter-date-picker-wrapper-radius: calc(var(--spacing-unit) * 1.5);
+  --filter-date-picker-wrapper-padding: calc(var(--spacing-xxs) / 2) var(--spacing-xs);
+
+  // @tokens End
+`;

package/src/components/Footer/CustomFooterNavItem.tsx

@@ -25,7 +25,7 @@ const FooterItem = styled.li`
   display: inline-block;
   text-align: center;
   line-height: var(--line-height-base);
-  font-size: var(--navbar-item-font-size);
+  font-size: var(--navbar-font-size);
   margin: calc(var(--spacing-unit) * 2) calc(var(--spacing-unit) * 3);
   font-weight: var(--font-weight-regular);
 `;

package/src/components/Footer/Footer.tsx

@@ -5,13 +5,15 @@ import { FooterColumns } from '@theme/components/Footer/FooterColumns';
 import { FooterCopyright } from '@theme/components/Footer/FooterCopyright';
 import { isEmptyArray } from '@theme/utils';
 import { useThemeConfig } from '@theme/hooks';
-import type { ResolvedNavItem } from '@theme/types/portal';
+import type { LogoConfig, ResolvedNavItem } from '@theme/types/portal';
+import { Flex } from '@theme/ui';
+import { LogoContainer, NavbarLogo } from '@theme/components/NavbarLogo';
 
 export function Footer(): JSX.Element | null {
-  const { footer } = useThemeConfig() || {};
+  const { footer, logo } = useThemeConfig() || {};
   const { items, copyrightText } = footer || {};
 
-  if (isEmptyArray(items) || !copyrightText || footer?.hide) {
+  if (isEmptyArray(items) || footer?.hide) {
     return null;
   }
 
@@ -19,38 +21,58 @@ export function Footer(): JSX.Element | null {
     <FooterPresentationalComponent
       items={items as ResolvedNavItem[]}
       copyrightText={copyrightText}
+      logo={logo}
     />
   );
 }
 
 interface FooterPresentationalComponentProps {
   items: ResolvedNavItem[];
-  copyrightText: string;
+  copyrightText?: string;
+  logo?: LogoConfig;
   className?: string;
 }
 
 export function FooterPresentationalComponent({
   items,
   copyrightText,
+  logo,
   className,
 }: FooterPresentationalComponentProps): JSX.Element | null {
   return (
     <FooterContainer data-component-name="Footer/Footer" className={className}>
-      <FooterColumns columns={items as ResolvedNavItem[]} />
-      <FooterCopyright copyrightText={copyrightText} />
+      <ColumnsSection>
+        {logo && <NavbarLogo logo={logo as Pick<LogoConfig, 'image' | 'link' | 'altText'>} />}
+        <FooterColumns columns={items as ResolvedNavItem[]} />
+      </ColumnsSection>
+      {copyrightText && <FooterCopyright copyrightText={copyrightText} />}
     </FooterContainer>
   );
 }
 
+const ColumnsSection = styled(Flex)`
+  flex-direction: column;
+
+  ${({ theme }) => theme.mediaQueries.small} {
+    flex-direction: row;
+  }
+`;
+
 const FooterContainer = styled.footer`
+  padding: var(--mobile-footer-padding-vertical) var(--mobile-footer-padding-horizontal);
+  border-top: 1px solid var(--footer-border-color);
   font-size: var(--footer-font-size);
   flex-shrink: 0;
   background-color: var(--footer-background-color);
   color: var(--footer-text-color);
-  font-family: var(--footer-font-family);
   font-weight: var(--footer-font-weight);
-  a,
-  a:hover {
-    color: var(--footer-text-color);
+
+  ${LogoContainer} {
+    display: var(--footer-logo-display);
+    margin: 0 var(--footer-logo-margin-right) var(--footer-logo-margin-bottom) 0;
+  }
+
+  ${({ theme }) => theme.mediaQueries.small} {
+    padding: var(--footer-padding-vertical) var(--footer-padding-horizontal);
   }
 `;

package/src/components/Footer/FooterColumn.tsx

@@ -1,9 +1,11 @@
 import React from 'react';
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
 import { Link } from '@portal/Link';
 import type { ResolvedNavItem } from '@theme/types/portal';
 import { useTranslate } from '@portal/hooks';
+import { Image } from '@theme/components/Image/Image';
+import { telemetry } from '@portal/telemetry';
 
 interface FooterColumnProps {
   column: ResolvedNavItem;
@@ -12,51 +14,58 @@ interface FooterColumnProps {
 
 export function FooterColumn({ column, className }: FooterColumnProps): JSX.Element {
   const { translate } = useTranslate();
-  const hasIcon = column.items ? column.items.some((item) => !!item.icon) : false;
+  const { items = [] } = column;
+
+  const iconsOnly = items.every((item) => item.label === item.link && (item.icon || item.srcSet));
 
   return (
     <FooterColumnContainer data-component-name="Footer/FooterColumn" className={className}>
-      <FooterColumnTitle withIconPadding={hasIcon}>
-        {translate(column.labelTranslationKey, column.label)}
-      </FooterColumnTitle>
-      {column?.items?.map((columnItem, columnItemIndex) => {
-        if (columnItem.type === 'error') {
-          return null;
-        }
-
-        return columnItem.type === 'separator' ? (
-          <FooterSeparator key={columnItem.label + '_' + columnItemIndex}>
-            {translate(columnItem.labelTranslationKey, columnItem.label)}
-          </FooterSeparator>
-        ) : (
-          <FooterLink
-            key={columnItemIndex}
-            to={columnItem.link}
-            external={columnItem.external}
-            target={columnItem.target}
-            data-cy={columnItem.label}
-          >
-            <FooterLinkIcon url={columnItem.icon} withIconPadding={hasIcon} />
-            {translate(columnItem.labelTranslationKey, columnItem.label)}
-          </FooterLink>
-        );
-      })}
+      <FooterColumnTitle>{translate(column.labelTranslationKey, column.label)}</FooterColumnTitle>
+      <FooterColumnItems iconsOnly={iconsOnly}>
+        {items?.map((columnItem, columnItemIndex) => {
+          if (columnItem.type === 'error') {
+            return null;
+          }
+
+          return columnItem.type === 'separator' ? (
+            <FooterSeparator key={columnItem.label + '_' + columnItemIndex}>
+              {translate(columnItem.labelTranslationKey, columnItem.label)}
+            </FooterSeparator>
+          ) : (
+            <FooterLink
+              key={columnItemIndex}
+              to={columnItem.link}
+              external={columnItem.external}
+              target={columnItem.target}
+              data-cy={columnItem.label}
+              iconsOnly={iconsOnly}
+              onClick={() => telemetry.send('footer_item_clicked', {})}
+            >
+              {columnItem.icon || columnItem.srcSet ? (
+                <FooterLinkIcon>
+                  <Image src={columnItem.icon} srcSet={columnItem.srcSet} />
+                </FooterLinkIcon>
+              ) : null}
+              {!iconsOnly && translate(columnItem.labelTranslationKey, columnItem.label)}
+            </FooterLink>
+          );
+        })}
+      </FooterColumnItems>
     </FooterColumnContainer>
   );
 }
 
-const FooterColumnTitle = styled.p<{ withIconPadding: boolean }>`
+const FooterColumnTitle = styled.p`
   display: inline-block;
   font-weight: var(--footer-title-font-weight);
   font-size: var(--footer-title-font-size);
-  margin-bottom: var(--footer-title-margin-vertical);
-  ${({ withIconPadding }) =>
-    withIconPadding &&
-    css`
-      padding-left: calc(var(--footer-item-icon-width) + var(--footer-item-icon-margin-right));
-    `}
-  font-family: var(--footer-font-family);
+  margin-top: 0;
+  margin-bottom: var(--mobile-footer-title-margin-bottom);
   color: var(--footer-title-text-color);
+
+  ${({ theme }) => theme.mediaQueries.small} {
+    margin-bottom: var(--footer-title-margin-bottom);
+  }
 `;
 
 const FooterSeparator = styled.div`
@@ -64,46 +73,56 @@ const FooterSeparator = styled.div`
   margin: 10px 0 5px 0;
   font-size: 0.75em;
   text-transform: uppercase;
-  font-family: var(--footer-font-family);
 `;
 
 const FooterColumnContainer = styled.div`
   display: flex;
   flex-direction: column;
-  text-align: left;
-  margin: var(--footer-column-margin-horizontal) var(--footer-column-margin-vertical);
-  width: var(--footer-column-width);
+  text-align: center;
   word-break: break-word;
+  flex: 1;
+  margin: 0 0 var(--mobile-footer-column-margin-bottom) 0;
+  min-width: var(--footer-column-min-width);
+
+  ${({ theme }) => theme.mediaQueries.small} {
+    text-align: left;
+    margin: 0 var(--footer-column-margin-horizontal);
+    border-right: 1px solid var(--footer-dividing-border-color);
+    margin-bottom: var(--footer-column-margin-bottom);
+  }
 `;
 
-const FooterLink = styled(Link)`
-  font-weight: var(--font-weight-bold);
-  padding: var(--footer-item-padding-vertical) var(--footer-item-padding-horizontal);
+export const FooterLinkIcon = styled.div`
+  display: inline-flex;
+  width: var(--footer-item-icon-width);
+  height: var(--footer-item-icon-height);
+  margin-right: var(--footer-item-icon-margin-right);
+  vertical-align: middle;
+  border: 1px solid var(--footer-item-icon-border-color);
+  border-radius: var(--footer-item-icon-border-radius);
+  padding: var(--footer-item-icon-padding);
+`;
+
+const FooterLink = styled(Link)<{ iconsOnly: boolean }>`
+  padding: var(--footer-link-padding-vertical) var(--footer-link-padding-horizontal);
   color: var(--footer-link-text-color);
   text-decoration: none;
   &:hover {
     color: var(--footer-link-hover-color);
   }
+
+  &:last-child ${FooterLinkIcon} {
+    margin-right: ${({ iconsOnly }) => (iconsOnly ? '0' : 'var(--footer-item-icon-margin-right)')};
+  }
 `;
 
-export const FooterLinkIcon = styled.i<{ url?: string; withIconPadding: boolean }>`
-  ${({ withIconPadding, url }) =>
-    withIconPadding &&
-    !url &&
-    css`
-      padding-left: calc(var(--footer-item-icon-width) + var(--footer-item-icon-margin-right));
-    `}
-  ${({ url }) =>
-    url &&
-    css`
-      background-image: url('${url}');
-      background-size: contain;
-      background-position: center;
-      background-repeat: no-repeat;
-      width: var(--footer-item-icon-width);
-      height: var(--footer-item-icon-height);
-      display: inline-block;
-      margin-right: var(--footer-item-icon-margin-right);
-      vertical-align: middle;
-    `}
+export const FooterColumnItems = styled.div<{ iconsOnly: boolean }>`
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: center;
+  flex-direction: ${(props) => (props.iconsOnly ? 'row' : 'column')};
+
+  ${({ theme }) => theme.mediaQueries.small} {
+    justify-content: flex-start;
+  }
 `;

package/src/components/Footer/FooterColumns.tsx

@@ -26,15 +26,15 @@ export function FooterColumns({ columns, className }: FooterColumnsProps): JSX.E
 }
 
 export const FooterColumnsContainer = styled.div`
-  padding: var(--footer-padding-vertical) var(--footer-padding-horizontal);
   display: flex;
   flex-direction: column;
   justify-content: center;
   max-width: var(--footer-container-max-width);
-  margin: 0 auto;
+  margin: 0;
+  flex: 1;
 
   ${({ theme }) => theme.mediaQueries.small} {
-    padding: 5.625em 20px 3.9375em 20px;
+    margin: 0 auto;
   }
 
   ${({ theme }) => theme.mediaQueries.print} {
@@ -47,8 +47,10 @@ export const FooterRow = styled.div`
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
+  flex-direction: column;
 
   ${({ theme }) => theme.mediaQueries.small} {
-    justify-content: space-evenly;
+    justify-content: space-between;
+    flex-direction: row;
   }
 `;