@redocly/theme 0.18.3-patch.8 → 0.18.4

package/src/components/Select/Select.tsx

@@ -1,46 +1,32 @@
-import React, { useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
 
 import { ArrowIcon } from '@theme/icons';
 import { useOutsideClick } from '@theme/hooks';
 
-export interface SelectProps<T = any> {
-  value: T;
-  options: {
-    element: React.ReactNode | string;
-    value: T;
-    label?: string;
-  }[];
+export interface SelectProps {
+  selected: React.ReactNode | string;
+  options: React.ReactNode[] | string[];
   dataAttributes?: Record<string, string>;
   className?: string;
   withArrow?: boolean;
   triggerEvent?: 'click' | 'hover';
-  onChange?: (value: any) => void;
-  placement?: 'top' | 'bottom';
-  alignment?: 'start' | 'end';
-  icon?: React.ReactNode;
-  onlyIcon?: boolean;
-  placeholder?: string;
+  onChange?: (value: React.ReactNode | string) => void;
 }
 
-export function Select<T>({
+export const Select = ({
   className,
-  value,
+  selected,
   options,
   dataAttributes,
-  withArrow = true,
+  withArrow,
   triggerEvent = 'click',
   onChange,
-  placement,
-  alignment,
-  icon,
-  onlyIcon,
-  placeholder,
-}: SelectProps<T>) {
-  const containerRef = useRef<HTMLDivElement | null>(null);
+}: SelectProps) => {
+  const selectRef = useRef<HTMLDivElement | null>(null);
 
   const [isOpen, setIsOpen] = useState<boolean>(false);
-  // const [selectedIdx, setSelectedIdx] = useState<React.ReactNode | string>(selected);
+  const [_selected, setSelected] = useState<React.ReactNode | string>(selected);
 
   const handleOpen = () => {
     setIsOpen(true);
@@ -54,56 +40,45 @@ export function Select<T>({
     setIsOpen(!isOpen);
   };
 
-  const handleSelect = (value: T) => {
-    // setSelectedIdx(options.findIndex(o => o.value === value));
+  const handleSelect = (value: React.ReactNode | string) => {
+    setSelected(value);
     setIsOpen(false);
     onChange?.(value);
   };
 
-  useOutsideClick(containerRef, handleClose);
+  useOutsideClick(selectRef, handleClose);
 
-  // useEffect(() => {
-  //   handleSelect(selected);
-  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [selected]);
-
-  const selectedOption = options.find((option) => option.value === value);
+  useEffect(() => {
+    handleSelect(selected);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [selected]);
 
   return (
     <SelectContainer
       {...dataAttributes}
       data-testid="select"
       className={className}
-      ref={containerRef}
+      ref={selectRef}
       onPointerEnter={triggerEvent === 'hover' ? handleOpen : undefined}
       onPointerLeave={triggerEvent === 'hover' ? handleClose : undefined}
       onClick={triggerEvent === 'click' ? handleToggle : undefined}
     >
       <SelectInput>
-        {!onlyIcon && (
-          <SelectInputValue>
-            {selectedOption?.label || selectedOption?.element || placeholder}
-          </SelectInputValue>
-        )}
-        {icon}
+        <SelectInputValue withArrow={withArrow}>{_selected}</SelectInputValue>
         {withArrow ? isOpen ? <ArrowIcon direction="up" /> : <ArrowIcon direction="down" /> : null}
       </SelectInput>
       {isOpen && (
-        <SelectList placement={placement} alignment={alignment}>
+        <SelectList>
           {options.map((option, index) => (
-            <SelectListItem
-              key={index}
-              onClick={() => handleSelect(option.value)}
-              selected={option.value === value}
-            >
-              {typeof option.element === 'string' ? <div>{option.element}</div> : option.element}
+            <SelectListItem key={index} onClick={() => handleSelect(option)}>
+              {option}
             </SelectListItem>
           ))}
         </SelectList>
       )}
     </SelectContainer>
   );
-}
+};
 
 export const SelectContainer = styled.div`
   position: relative;
@@ -127,23 +102,19 @@ export const SelectInput = styled.div`
   border-radius: var(--select-input-border-radius);
   padding: var(--select-input-padding-vertical) var(--select-input-padding-horizontal);
   cursor: pointer;
-  gap: 8px;
 `;
 
-export const SelectInputValue = styled.div`
+export const SelectInputValue = styled.div<{ withArrow?: boolean }>`
   pointer-events: none;
-  min-width: 0;
+  ${({ withArrow }) => (withArrow ? 'margin-right: 8px;' : '')}
 `;
 
-export const SelectList = styled.ul<{ placement?: string; alignment?: string }>`
+export const SelectList = styled.ul`
   position: absolute;
-  top: ${({ placement }) => (placement === 'top' ? 'auto' : '100%')};
-  bottom: ${({ placement }) => (placement === 'top' ? '100%' : 'auto')};
-  left: ${({ alignment }) => (alignment === 'start' ? '0' : 'auto')};
-  right: ${({ alignment }) => (alignment === 'end' ? '0' : 'auto')};
+  top: 100%;
+  left: 0;
   margin: 0;
   min-width: var(--select-list-min-width);
-  width: 100%;
   max-width: var(--select-list-max-width);
   padding: var(--select-list-padding);
   background-color: var(--select-list-background-color);
@@ -156,7 +127,7 @@ export const SelectList = styled.ul<{ placement?: string; alignment?: string }>`
   z-index: 1;
 `;
 
-export const SelectListItem = styled.li<{ selected: boolean }>`
+export const SelectListItem = styled.li`
   border-radius: var(--select-list-item-border-radius);
 
   & > * {
@@ -164,12 +135,6 @@ export const SelectListItem = styled.li<{ selected: boolean }>`
   }
 
   :hover {
-    background-color: var(--select-list-item-hover-background-color);
+    background-color: var(--select-list-item-active-background-color);
   }
-
-  ${({ selected }) =>
-    selected &&
-    `
-    &, &:hover { background-color: var(--select-list-item-active-background-color); }
-    `}
 `;

package/src/components/Select/index.ts

@@ -1,2 +1 @@
 export * from '@theme/components/Select/Select';
-export * from '@theme/components/Select/styledVariables';

package/src/components/Separator/Separator.tsx

@@ -5,30 +5,16 @@ import { SeparatorLine } from '@theme/components/Separator/SeparatorLine';
 import { SeparatorItem } from '@theme/components/Separator/SeparatorItem';
 import type { MenuItemProps } from '@theme/components/Sidebar/types';
 import { useTranslate } from '@portal/hooks';
-import { useThemeConfig } from '@theme/hooks';
 
 export function Separator({ item, className }: MenuItemProps): JSX.Element {
   const { translate } = useTranslate();
-  const { sidebar } = useThemeConfig();
-
-  const separatorLine = item.separatorLine || sidebar?.separatorLine;
-  const linePosition = item.linePosition || sidebar?.linePosition || 'bottom';
 
   return (
-    <Wrapper
-      data-component-name="Sidebar/Separator"
-      className={className}
-      linePosition={linePosition}
-      withLabel={!!item.label}
-    >
+    <Wrapper data-component-name="Sidebar/Separator" className={className}>
       <SeparatorItem>{translate(item.labelTranslationKey, item.label)}</SeparatorItem>
-      {separatorLine ? <SeparatorLine /> : null}
+      {item.separatorLine ? <SeparatorLine /> : null}
     </Wrapper>
   );
 }
 
-const Wrapper = styled.div<{ linePosition: 'top' | 'bottom'; withLabel?: boolean }>`
-  display: flex;
-  flex-direction: ${({ linePosition }) => (linePosition === 'top' ? 'column-reverse' : 'column')};
-  margin-top: ${({ withLabel }) => (withLabel ? 'var(--sidebar-item-separator-offset)' : '0')};
-`;
+const Wrapper = styled.div``;

package/src/components/Separator/SeparatorItem.tsx

@@ -9,20 +9,23 @@ export const SeparatorItem = styled(MenuItemLabel).attrs<{ className?: string }>
   }),
 )`
   cursor: default;
-  font-weight: var(--sidebar-item-separator-font-weight);
-  color: var(--sidebar-item-separator-text-color);
+  font-weight: var(--font-weight-bold);
+  color: var(--sidebar-separator-item-color);
+  font-family: var(--sidebar-item-separator-font-family);
   font-size: var(--sidebar-item-separator-font-size);
   text-transform: var(--sidebar-item-separator-text-transform);
   background: var(--mobile-menu-background);
-  border-radius: 0;
-  padding: var(--sidebar-item-separator-padding);
 
   ${({ theme }) => theme.mediaQueries.medium} {
     background: var(--sidebar-item-separator-background-color);
   }
 
+  *:not(:first-child) > & {
+    margin-top: var(--sidebar-item-separator-offset);
+  }
+
   :hover {
-    color: var(--sidebar-item-separator-text-color);
-    background: none;
+    color: inherit;
+    background-color: inherit;
   }
 `;

package/src/components/Separator/SeparatorLine.tsx

@@ -4,11 +4,7 @@ export const SeparatorLine = styled.div.attrs<{ className?: string }>(({ classNa
   'data-component-name': 'Sidebar/SeparatorLine',
   className,
 }))`
-  height: var(--sidebar-item-separator-border-width);
-  background-color: var(--sidebar-item-separator-border-color);
-  margin: var(--mobile-sidebar-item-separator-line-offset);
-
-  ${({ theme }) => theme.mediaQueries.medium} {
-    margin: var(--sidebar-item-separator-line-offset);
-  }
+  height: 1px;
+  background-color: var(--sidebar-item-separator-line-color);
+  margin: var(--sidebar-item-separator-offset) 0 var(--sidebar-item-padding-vertical) 0;
 `;

package/src/components/Sidebar/ApiCallItem.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 
-import { Tag } from '@theme/components/Tag';
+import { OperationBadge } from '@theme/components/OperationBadge';
 import { MenuLinkItem } from '@theme/components/Menu/MenuLinkItem';
 import { SeparatorLine } from '@theme/components/Separator/SeparatorLine';
 import { MenuItemLabel } from '@theme/components/Menu/MenuItemLabel';
@@ -12,10 +12,10 @@ export function ApiCallItem({ item, className }: MenuItemProps): JSX.Element {
     <Wrapper data-component-name="Sidebar/ApiCallItem" className={className}>
       <MenuLinkItem item={item}>
         <Label active={item.active}>
-          {item.label}
-          <HttpTag color={item.httpVerb || ''}>
+          <Badge type={item.httpVerb || ''}>
             {item.httpVerb === 'hook' ? 'event' : item.httpVerb}
-          </HttpTag>
+          </Badge>
+          {item.label}
         </Label>
       </MenuLinkItem>
 
@@ -25,8 +25,6 @@ export function ApiCallItem({ item, className }: MenuItemProps): JSX.Element {
 }
 
 const Label = styled(MenuItemLabel)`
-  display: flex;
-  justify-content: space-between;
   color: var(--mobile-menu-item-text-color);
 
   ${({ theme }) => theme.mediaQueries.medium} {
@@ -36,16 +34,14 @@ const Label = styled(MenuItemLabel)`
 
 const Wrapper = styled.div``;
 
-export const HttpTag = styled(Tag)`
+export const Badge = styled(OperationBadge)`
   flex-shrink: 0;
-  margin: var(--sidebar-item-http-tag-margin);
-  text-transform: uppercase;
-
-  width: var(--sidebar-item-http-tag-width);
-  height: var(--sidebar-item-http-tag-height);
-
-  font-size: var(--sidebar-item-http-tag-font-size);
-  font-family: var(--sidebar-item-http-tag-font-family);
-  font-weight: var(--sidebar-item-http-tag-font-weight);
-  border-radius: var(--sidebar-item-http-tag-border-radius);
+  margin-top: 0;
+  width: 36px;
+  height: 14px;
+  font-size: var(--sidebar-item-badge-http-font-size);
+  font-family: var(--sidebar-item-badge-http-font-family);
+  font-weight: var(--sidebar-item-badge-http-font-weight);
+  border-radius: var(--sidebar-item-badge-http-border-radius);
+  color: var(--sidebar-item-badge-http-text-color);
 `;

package/src/components/Sidebar/FooterWrapper.tsx

@@ -1,14 +1,15 @@
 import styled from 'styled-components';
 export const FooterWrapper = styled.div<{ collapsed?: boolean }>`
-  padding: var(--sidebar-footer-padding-vertical) var(--sidebar-footer-padding-horizontal);
-
   ${({ collapsed }) =>
     collapsed &&
     `
         position: sticky;
         bottom: 0;
-        padding: 0;
     `}
+  margin: var(--sidebar-offset-top) 0 var(--sidebar-spacing-unit) var(--sidebar-offset-left);
+  padding-top: var(--sidebar-spacing-unit);
+  padding-right: var(--sidebar-spacing-unit);
+  border-top: solid 1px var(--border-color);
 
   button {
     margin: 0;

package/src/components/Sidebar/HeaderWrapper.tsx

@@ -4,7 +4,7 @@ export const HeaderWrapper = styled.div.attrs<{ className?: string }>(({ classNa
   'data-component-name': 'Sidebar/HeaderWrapper',
   className,
 }))`
-  margin: var(--sidebar-offset-top) 0 0 0;
-  padding: 0 0 var(--sidebar-header-padding-bottom) var(--sidebar-offset-left);
-  border-bottom: solid 1px var(--border-secondary);
+  margin: var(--sidebar-offset-top) 0 0 var(--sidebar-offset-left);
+  padding-bottom: var(--sidebar-spacing-unit);
+  border-bottom: solid 1px var(--border-color);
 `;

package/src/components/Sidebar/VersionPicker.tsx

@@ -9,11 +9,6 @@ export const VersionPicker = styled(Select).attrs(() => ({
     'data-component-name': 'Sidebar/VersionPicker',
   },
 }))<SelectProps>`
-  --select-list-item-active-background-color: var(
-    --version-picker-list-item-active-background-color
-  );
-  --select-list-item-hover-background-color: var(--version-picker-list-item-hover-background-color);
-
   font-size: var(--version-picker-font-size);
   font-weight: var(--version-picker-font-weight);
   border-radius: var(--version-picker-border-radius);
@@ -45,5 +40,9 @@ export const VersionPicker = styled(Select).attrs(() => ({
       padding: var(--version-picker-list-item-vertical-padding)
         var(--version-picker-list-item-horizontal-padding);
     }
+
+    :hover {
+      background-color: var(--version-picker-list-item-active-background-color);
+    }
   }
 `;

package/src/components/Sidebar/index.ts

@@ -11,4 +11,3 @@ export * from '@theme/components/Sidebar/FooterWrapper';
 export * from '@theme/components/Sidebar/HeaderWrapper';
 export * from '@theme/components/Sidebar/SidebarItemIcon';
 export * from '@theme/components/Sidebar/VersionPicker';
-export * from '@theme/components/Sidebar/styledVariables';

package/src/components/Sidebar/types.ts

@@ -47,7 +47,6 @@ export interface NavItem {
   requiredPermission?: string;
   menuStyle?: MenuStyle;
   separatorLine?: boolean;
-  linePosition?: 'top' | 'bottom';
   version?: string;
   default?: boolean;
 }

package/src/components/SidebarActions/CollapseSidebarButton.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import styled, { css } from 'styled-components';
 
 import {
   StyledToggleRightPanelButton,
@@ -16,30 +15,11 @@ export const CollapseSidebarButton = ({
   onClick,
 }: CollapseSidebarButtonProps): JSX.Element => {
   return (
-    <ToggleButton
+    <StyledToggleRightPanelButton
       title={initialValue ? 'Show sidebar' : 'Hide sidebar'}
       onClick={onClick}
-      collapsed={initialValue}
     >
       {initialValue ? <HideLeftPanelSVG /> : <ShowLeftPanelSVG />}
-    </ToggleButton>
+    </StyledToggleRightPanelButton>
   );
 };
-
-const ToggleButton = styled(StyledToggleRightPanelButton)<{ collapsed?: boolean }>`
-  background: var(--sidebar-collapse-button-background-color);
-  fill: var(--sidebar-collapse-button-icon-color);
-  margin-right: ${({ collapsed }) => (collapsed ? 0 : 'calc(var(--spacing-unit) * -9)')};
-  border: 1px solid var(--sidebar-collapse-button-border-color);
-  border-radius: var(--border-radius-md);
-  padding: var(--spacing-xxs);
-  height: var(--control-height-sm);
-  width: var(--control-height-sm);
-
-  ${({ collapsed }) =>
-    collapsed &&
-    css`
-      background: var(--sidebar-collapse-button-active-background-color);
-      border: var(--sidebar-collapse-button-active-border-color);
-    `}
-`;

package/src/components/SidebarActions/styled.tsx

@@ -5,7 +5,7 @@ export const ShowLeftPanelSVG = styled(() => (
   <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path
       d="M4.375 7L8.75 2.625L9.3625 3.2375L5.6 7L9.3625 10.7625L8.75 11.375L4.375 7Z"
-      fill="var(--text-secondary)"
+      fill="var(--color-emphasis-400)"
     />
   </svg>
 ))`
@@ -16,7 +16,7 @@ export const HideLeftPanelSVG = styled(() => (
   <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path
       d="M9.62495 7L5.24995 11.375L4.63745 10.7625L8.39995 7L4.63745 3.2375L5.24995 2.625L9.62495 7Z"
-      fill="var(--text-secondary)"
+      fill="var(--color-emphasis-400)"
     />
   </svg>
 ))`
@@ -30,14 +30,11 @@ export const StyledToggleRightPanelButton = styled.a`
   cursor: pointer;
   z-index: 1;
   /* Rectangle 201 */
-  border-radius: var(--border-radius-md);
-  padding: var(--spacing-xs);
-  height: var(--control-height-base);
-  width: var(--control-height-base);
-  border: 1px solid var(--border-primary);
+  border-radius: var(--border-radius);
+  padding: var(--spacing-unit);
 
   &:hover {
-    background-color: var(--sidebar-item-hover-background-color);
+    background-color: var(--sidebar-item-active-background-color);
   }
 `;
 
@@ -45,7 +42,7 @@ export const HideRightPanelSVG = styled(() => (
   <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path
       d="M14 2H2C1.73478 2 1.48043 2.10536 1.29289 2.29289C1.10536 2.48043 1 2.73478 1 3V13C1 13.2652 1.10536 13.5196 1.29289 13.7071C1.48043 13.8946 1.73478 14 2 14H14C14.2652 14 14.5196 13.8946 14.7071 13.7071C14.8946 13.5196 15 13.2652 15 13V3C15 2.73478 14.8946 2.48043 14.7071 2.29289C14.5196 2.10536 14.2652 2 14 2V2ZM2 3H10V13H2V3Z"
-      fill="currentColor"
+      fill="var(--color-emphasis-400)"
     />
   </svg>
 ))`
@@ -56,7 +53,7 @@ export const ShowRightPanelSVG = styled(() => (
   <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path
       d="M14 2H2C1.73478 2 1.48043 2.10536 1.29289 2.29289C1.10536 2.48043 1 2.73478 1 3V13C1 13.2652 1.10536 13.5196 1.29289 13.7071C1.48043 13.8946 1.73478 14 2 14H14C14.2652 14 14.5196 13.8946 14.7071 13.7071C14.8946 13.5196 15 13.2652 15 13V3C15 2.73478 14.8946 2.48043 14.7071 2.29289C14.5196 2.10536 14.2652 2 14 2V2ZM2 3H10V13H2V3ZM14 13H11V3H14V13Z"
-      fill="currentColor"
+      fill="var(--color-emphasis-400)"
     />
   </svg>
 ))`
@@ -69,26 +66,29 @@ export const StyledChangeViewButton = styled.a`
   justify-content: center;
   align-items: center;
   cursor: pointer;
-  border-radius: var(--border-radius-md);
-  background: var(--bg-overlay);
+  border-radius: var(--border-radius);
   z-index: 1;
   /* Rectangle 201 */
-  padding: var(--spacing-xs);
-  height: var(--control-height-base);
-  width: var(--control-height-base);
+  padding: var(--spacing-unit);
 
   &:hover {
-    background-color: var(--sidebar-item-hover-background-color);
+    background-color: var(--sidebar-item-active-background-color);
   }
 `;
 
 export const ChangeViewSvgRow = styled(() => (
   <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M1.75 2.625L12.25 2.625L12.25 1.75L1.75 1.75L1.75 2.625Z" fill="currentColor" />
-    <path d="M1.75 5.6875L12.25 5.6875L12.25 4.8125L1.75 4.8125L1.75 5.6875Z" fill="currentColor" />
+    <path
+      d="M1.75 2.625L12.25 2.625L12.25 1.75L1.75 1.75L1.75 2.625Z"
+      fill="var(--color-emphasis-400)"
+    />
+    <path
+      d="M1.75 5.6875L12.25 5.6875L12.25 4.8125L1.75 4.8125L1.75 5.6875Z"
+      fill="var(--color-emphasis-400)"
+    />
     <path
       d="M2.625 11.375L2.625 8.75L11.375 8.75L11.375 11.375L2.625 11.375ZM2.625 12.25L11.375 12.25C11.6071 12.25 11.8296 12.1578 11.9937 11.9937C12.1578 11.8296 12.25 11.6071 12.25 11.375L12.25 8.75C12.25 8.51794 12.1578 8.29538 11.9937 8.13128C11.8296 7.96719 11.6071 7.875 11.375 7.875L2.625 7.875C2.39294 7.875 2.17038 7.96719 2.00628 8.13128C1.84219 8.29538 1.75 8.51793 1.75 8.75L1.75 11.375C1.75 11.6071 1.84219 11.8296 2.00628 11.9937C2.17038 12.1578 2.39294 12.25 2.625 12.25Z"
-      fill="currentColor"
+      fill="var(--color-emphasis-400)"
     />
   </svg>
 ))`
@@ -97,14 +97,17 @@ export const ChangeViewSvgRow = styled(() => (
 
 export const ChangeViewSvgColumn = styled(() => (
   <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M2.625 12.25L2.625 1.75L1.75 1.75L1.75 12.25L2.625 12.25Z" fill="currentColor" />
+    <path
+      d="M2.625 12.25L2.625 1.75L1.75 1.75L1.75 12.25L2.625 12.25Z"
+      fill="var(--color-emphasis-400)"
+    />
     <path
       d="M5.6875 12.25L5.6875 1.75L4.8125 1.75L4.8125 12.25L5.6875 12.25Z"
-      fill="currentColor"
+      fill="var(--color-emphasis-400)"
     />
     <path
       d="M11.375 11.375L8.75 11.375L8.75 2.625L11.375 2.625L11.375 11.375ZM12.25 11.375L12.25 2.625C12.25 2.39294 12.1578 2.17038 11.9937 2.00628C11.8296 1.84219 11.6071 1.75 11.375 1.75L8.75 1.75C8.51794 1.75 8.29538 1.84219 8.13128 2.00628C7.96719 2.17038 7.875 2.39294 7.875 2.625L7.875 11.375C7.875 11.6071 7.96719 11.8296 8.13128 11.9937C8.29538 12.1578 8.51794 12.25 8.75 12.25L11.375 12.25C11.6071 12.25 11.8296 12.1578 11.9937 11.9937C12.1578 11.8296 12.25 11.6071 12.25 11.375Z"
-      fill="currentColor"
+      fill="var(--color-emphasis-400)"
     />
   </svg>
 ))`
@@ -120,9 +123,9 @@ export const ControlsWrap = styled.span<{
   justify-content: ${({ isOpenapiDocs }) => (isOpenapiDocs ? 'space-between' : 'flex-end')};
   bottom: 0;
   flex-direction: row;
-  gap: var(--spacing-xs);
+  gap: var(--spacing-unit);
   align-items: center;
-  margin-left: var(--sidebar-controls-margin-left);
+  margin-left: '15px';
   z-index: 2;
   background: var(--sidebar-background-color);
 
@@ -130,10 +133,8 @@ export const ControlsWrap = styled.span<{
     isCollapsed &&
     css`
       flex-direction: column;
-      margin-left: 0;
-      gap: var(--sidebar-controls-collapsed-gap);
-      padding: var(--sidebar-controls-collapsed-padding-vertical)
-        var(--sidebar-controls-collapsed-padding-horizontal);
+      gap: 10px;
+      padding-bottom: 10px;
     `}
 
   ${({ theme }) => css`
@@ -151,6 +152,6 @@ export const ControlsWrapChangeLayoutButtons = styled.span<{ isCollapsed?: boole
   display: flex;
   bottom: 0;
   flex-direction: ${({ isCollapsed }) => (isCollapsed ? 'column-reverse' : 'row')};
-  gap: ${({ isCollapsed }) => (isCollapsed ? '10px' : 'var(--spacing-xs)')};
+  gap: ${({ isCollapsed }) => (isCollapsed ? '10px' : 'var(--spacing-unit)')};
   align-items: center;
 `;

package/src/components/TableOfContent/TableOfContent.tsx

@@ -81,13 +81,12 @@ const TocHeader = styled.div`
   font-weight: var(--toc-heading-font-weight);
   padding: var(--toc-item-padding-vertical) var(--toc-item-padding-horizontal);
   color: var(--toc-heading-text-color);
-  text-transform: var(--toc-heading-text-transform);
+  text-transform: uppercase;
 `;
 
 const MenuItem = styled.a<{ depth: number }>`
   display: block;
   color: var(--toc-item-text-color);
-  font-weight: var(--toc-item-font-weight);
   background-color: var(--toc-item-background-color);
   cursor: pointer;
   font-size: var(--toc-item-font-size);
@@ -101,6 +100,7 @@ const MenuItem = styled.a<{ depth: number }>`
   :hover,
   &.active {
     color: var(--toc-item-active-text-color);
+    background-color: var(--toc-item-active-background-color);
   }
 
   :empty {
@@ -123,6 +123,7 @@ const TableOfContentItems = styled.div`
   position: sticky;
   top: calc(var(--navbar-height) + var(--toc-offset-top));
   max-height: calc(100vh - var(--navbar-height) - var(--toc-offset-top));
+  border-left: 1px solid var(--toc-border-color);
   overflow-y: auto;
   width: var(--toc-width);
 `;

package/src/components/TableOfContent/index.ts

@@ -1,2 +1 @@
 export * from '@theme/components/TableOfContent/TableOfContent';
-export * from '@theme/components/TableOfContent/styledVariables';

package/src/components/Tabs/Tab.tsx

@@ -34,7 +34,7 @@ const TabItem = styled.li<{ active: boolean }>`
       background-color: var(--background-color);
       border: solid var(--md-tabs-active-tab-border-color);
       border-width: 0 0 1px 0;
-      color: var(--text-primary);
+      color: var(--text-color);
     `
       : `
     &:hover {

package/src/components/Tabs/Tabs.tsx

@@ -51,7 +51,7 @@ const TabList = styled.ol`
   color: var(--md-tabs-tab-text-color);
   padding: 0;
   margin-block-end: 0;
-  border: solid var(--border-primary);
+  border: solid var(--color-secondary-400);
   border-width: 0 0 1px 0;
 
   li[class^='Tab__TabItem'] {