@redocly/theme 0.18.2 → 0.18.3-patch.0

package/src/components/Markdown/styledVariables.ts

@@ -0,0 +1,219 @@
+import { css } from "styled-components";
+
+export const admonition = css`
+  /* === Admonitions === */
+
+  /**
+  * @tokens Admonition typography
+  */
+
+  --admonition-font-size: var(--font-size-base); // @presenter FontSize
+  --admonition-font-weight: var(--font-weight-regular); // @presenter FontWeight
+  --admonition-line-height: var(--line-height-base); // @presenter LineHeight
+  --admonition-heading-font-size: var(--font-size-base); // @presenter FontSize
+  --admonition-heading-font-weight: var(--font-weight-bold); // @presenter FontWeight
+  --admonition-heading-letter-spacing: 0.3px; // @presenter LetterSpacing
+  --admonition-heading-transform: uppercase;
+
+  /**
+  * @tokens Admonition spacing
+  * @presenter Spacing
+  */
+
+  --admonition-margin-horizontal: 0;
+  --admonition-margin-vertical:  var(--spacing-xs);
+  --admonition-padding-horizontal: var(--spacing-base);
+  --admonition-padding-vertical:  var(--spacing-base);
+  --admonition-icon-size: 25px;
+
+  /**
+  * @tokens Admonition border
+  */
+
+  --admonition-border-radius: var(--border-radius-lg); // @presenter BorderRadius
+  --admonition-border-style: var(--border-style);
+  --admonition-border-width: var(--border-width);
+
+  /**
+  * @tokens Admonition type info
+  */
+
+  --admonition-info-background-color: var(--color-info-bg); // @presenter Color
+  --admonition-info-heading-text-color: var(--text-primary); // @presenter Color
+  --admonition-info-text-color: var(--text-secondary); // @presenter Color
+  --admonition-info-icon-color: var(--color-info-base); // @presenter Color
+  --admonition-info-border-color: inherit; // @presenter Color
+  --admonition-info-border-style: var(--admonition-border-style);
+  --admonition-info-border-width: var(--admonition-border-width);
+  --admonition-info-border: var(--admonition-info-border-width) var(--admonition-info-border-style)
+    var(--admonition-info-border-color); // @presenter Border
+  --admonition-info-icon: none;
+
+  /**
+  * @tokens Admonition type attention
+  * @presenter Color
+  */
+
+  --admonition-attention-background-color: var(--color-yellow-1); // @presenter Color
+  --admonition-attention-text-color: var(--text-secondary); // @presenter Color
+  --admonition-attention-heading-text-color: var(--text-primary); // @presenter Color
+  --admonition-attention-icon-color: var(--color-yellow-6); // @presenter Color
+  --admonition-attention-border-color: inherit; // @presenter Color
+  --admonition-attention-border-style: var(--admonition-border-style);
+  --admonition-attention-border-width: var(--admonition-border-width);
+  --admonition-attention-border: var(--admonition-attention-border-width)
+    var(--admonition-attention-border-style) var(--admonition-attention-border-color); // @presenter Border
+  --admonition-attention-icon: none;
+
+  /**
+  * @tokens Admonition type warning
+  */
+
+  /* warning */
+  --admonition-warning-background-color: var(--color-warning-bg); // @presenter Color
+  --admonition-warning-text-color: var(--text-secondary); // @presenter Color
+  --admonition-warning-heading-text-color: var(--text-primary); // @presenter Color
+  --admonition-warning-icon-color: var(--color-warning-base); // @presenter Color
+  --admonition-warning-border-color: inherit; // @presenter Color
+  --admonition-warning-border-style: var(--admonition-border-style); // @presenter Color
+  --admonition-warning-border-width: var(--admonition-border-width); // @presenter Color
+  --admonition-warning-border: var(--admonition-warning-border-width)
+    var(--admonition-warning-border-style) var(--admonition-warning-border-color); // @presenter Border
+  --admonition-warning-icon: none;
+
+  /**
+  * @tokens Admonition type danger
+  */
+
+  --admonition-danger-background-color: var(--color-error-bg); // @presenter Color
+  --admonition-danger-text-color: var(--text-secondary); // @presenter Color
+  --admonition-danger-heading-text-color: var(--text-primary); // @presenter Color
+  --admonition-danger-icon-color: var(--color-error-base); // @presenter Color
+  --admonition-danger-border-color: inherit; // @presenter Color
+  --admonition-danger-border-style: var(--admonition-border-style); // @presenter Color
+  --admonition-danger-border-width: var(--admonition-border-width); // @presenter Color
+  --admonition-danger-border: var(--admonition-danger-border-width)
+    var(--admonition-danger-border-style) var(--admonition-danger-border-color); // @presenter Border
+  --admonition-danger-icon: none;
+
+  /**
+  * @tokens Admonition type success
+  */
+
+  --admonition-success-background-color: var(--color-success-bg); // @presenter Color
+  --admonition-success-text-color: var(--text-secondary); // @presenter Color
+  --admonition-success-heading-text-color: var(--text-primary); // @presenter Color
+  --admonition-success-icon-color: var(--color-success-base); // @presenter Color
+  --admonition-success-border-color: inherit; // @presenter Color
+  --admonition-success-border-style: var(--admonition-border-style); // @presenter Color
+  --admonition-success-border-width: var(--admonition-border-width); // @presenter Color
+  --admonition-success-border: var(--admonition-success-border-width)
+    var(--admonition-success-border-style) var(--admonition-success-border-color); // @presenter Border
+  --admonition-success-icon: none;
+
+  // @tokens End
+`;
+
+export const markdown = css`
+  /**
+  * @tokens Markdown Container
+  */
+
+  --md-container-max-width: 910px;
+  --md-container-padding-vertical: 25px; // @presenter Spacing
+  --md-container-padding-horizontal: 0px; // @presenter Spacing
+
+  /**
+  * @tokens Markdown Blockquote
+  */
+
+  --md-blockquote-margin-vertical: 1.5em; // @presenter Spacing
+  --md-blockquote-margin-horizontal: 0; // @presenter Spacing
+  --md-blockquote-padding-vertical: 0; // @presenter Spacing
+  --md-blockquote-padding-horizontal: var(--spacing-base); // @presenter Spacing
+  --md-blockquote-border-color: var(--border-primary); // @presenter Color
+  --md-blockquote-background-color: transparent; // @presenter Color
+  --md-blockquote-border-left: 4px solid var(--md-blockquote-border-color); // @presenter Border
+  --md-blockquote-text-color: var(--text-secondary); // @presenter Color
+  --md-blockquote-box-shadow: none; // @presenter Shadow
+
+  /**
+  * @tokens Markdown Paragraph
+  */
+
+  --md-paragraph-margin-vertical: 10px; // @presenter Spacing
+  --md-paragraph-margin-horizontal: 0px; // @presenter Spacing
+
+  /**
+  * @tokens Markdown Table
+  */
+
+  --md-table-font-size: var(--font-size-base); // @presenter FontSize
+  --md-table-margin-vertical: 20px; // @presenter Spacing
+  --md-table-background-color: transparent; // @presenter Color
+
+  --md-table-border-radius: var(--border-radius-lg); // @presenter BorderRadius
+  --md-table-border-width: 1px;
+  --md-table-border-color: var(--border-primary); // @presenter Color
+
+  --md-table-stripe-background-color: var(--md-table-background-color); // @presenter Color
+
+  --md-table-cell-text-color: var(--text-secondary); // @presenter Color
+  --md-table-cell-padding: var(--spacing-sm); // @presenter Spacing
+
+  --md-table-head-background-color: var(--bg-overlay); // @presenter Color
+  --md-table-head-text-color: var(--text-primary); // @presenter Color
+  --md-table-head-font-weight: var(--font-weight-bold); // @presenter FontWeight
+
+  /**
+  * @tokens Markdown Horizontal Rule
+  */
+
+  --md-hr-background-color: transparent; // @presenter Color
+  --md-hr-border-color: var(--border-primary); // @presenter Color
+  --md-hr-height: unset;
+  --md-hr-margin-vertical: 20px; // @presenter Spacing
+
+  /**
+  * @tokens Markdown List
+  */
+
+  --md-list-left-padding: 2rem; // @presenter Spacing
+  --md-list-margin: 1rem; // @presenter Spacing
+  --md-list-item-margin: 0.25rem; // @presenter Spacing
+  --md-list-item-style: inherit;
+
+
+  /**
+  * @tokens Markdown Checkbox List
+  */
+
+  --md-checkbox-list-item-style: none;
+
+  /**
+  * @tokens Markdown Numbered List
+  */
+
+  --md-numbered-list-number-display: none;
+  --md-numbered-list-item-style: var(--md-list-item-style);
+  --md-numbered-list-number-text-color: var(--text-secondary); // @presenter Color
+  --md-numbered-list-number-font-size: var(--font-size-base); // @presenter FontSize
+  --md-numbered-list-number-font-family: var(--font-size-base); // @presenter FontFamily
+  --md-numbered-list-number-font-weight: var(--font-weight-regular); // @presenter FontWeight
+  --md-numbered-list-number-background-color: var(--bg-raised); // @presenter Color
+  --md-numbered-list-number-border-radius: 10px; // @presenter BorderRadius
+  --md-numbered-list-number-margin-right: 5px; // @presenter Spacing
+  --md-numbered-list-number-padding: 0 5px; // @presenter Spacing
+
+  // @tokens End
+
+  /**
+  * @tokens Markdown Tabs
+  */
+
+  --md-tabs-tab-text-color: var(--text-secondary); // @presenter Color
+  --md-tabs-active-tab-border-color: var(--border-primary); // @presenter Color
+  --md-tabs-hover-tab-border-color: var(--border-secondary); // @presenter Color
+
+  // @tokens End
+`;

package/src/components/Menu/Menu.tsx

@@ -39,11 +39,9 @@ export function Menu({ depth = 0, items, className, isMobile }: MenuListProps) {
 export const ThemeMenu = styled.ul.attrs(() => ({
   'data-component-name': 'Menu/Menu',
 }))`
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  color: var(--sidebar-item-text-color);
-  ${({ theme }) => theme.mediaQueries.medium} {
-    position: relative;
-  }
+  padding: var(--menu-padding);
+  margin: var(--menu-margin);
+  list-style: var(--menu-list-style);
+  color: var(--menu-text-color);
+  position: relative;
 `;

package/src/components/Menu/MenuGroup.tsx

@@ -49,10 +49,13 @@ export function MenuGroup({
           isAlwaysExpanded={item.expanded === 'always'}
           active={item.active}
           role={!item.link ? 'link' : 'none'}
+          expanded={isExpanded}
         >
-          {!!item.items.length && <MenuGroupArrow direction={isExpanded ? 'down' : 'right'} />}
           {item.icon ? <SidebarItemIcon src={item.icon} /> : null}
           {translate(item.labelTranslationKey, item.label)}
+          {!!item.items.length && (
+            <ArrowIcon direction={isExpanded ? 'down' : 'right'} weight="thin" />
+          )}
         </MenuGroupLabel>
       </MenuLinkItem>
 
@@ -76,7 +79,7 @@ const MenuWrapper = styled.div<{ isExpanded?: boolean }>`
 	      transition: max-height .8s cubic-bezier(0, 1, 0, 1) -.1s;`};
 `;
 
-const MenuGroupLabel = styled(MenuItemLabel)<{ isAlwaysExpanded?: boolean }>`
+const MenuGroupLabel = styled(MenuItemLabel)<{ isAlwaysExpanded?: boolean; expanded?: boolean }>`
   padding-left: var(--sidebar-item-padding-horizontal);
   cursor: ${(props) => (props.isAlwaysExpanded ? 'default' : 'pointer')};
   font-family: var(--sidebar-item-group-font-family);
@@ -84,13 +87,18 @@ const MenuGroupLabel = styled(MenuItemLabel)<{ isAlwaysExpanded?: boolean }>`
   text-transform: var(--sidebar-text-group-transform);
   color: var(--sidebar-item-group-text-color);
   background: var(--sidebar-item-group-background-color);
-  ${(props) =>
-    props.active
+  display: flex;
+  justify-content: space-between;
+
+  ${({ active }) =>
+    active
       ? `color: var(--sidebar-item-group-active-text-color);
         background-color: var(--sidebar-item-group-active-background-color);`
       : null};
-`;
 
-const MenuGroupArrow = styled(ArrowIcon)`
-  margin-right: calc(var(--sidebar-spacing-unit) / 2);
+  ${({ expanded }) =>
+    expanded &&
+    `
+    color: var(--sidebar-item-group-active-text-color);
+  `}
 `;

package/src/components/Menu/MenuItemLabel.tsx

@@ -5,29 +5,24 @@ export const MenuItemLabel = styled.li.attrs<{ className?: string }>(({ classNam
   className,
 }))<{ active?: boolean }>`
   display: flex;
-  align-items: center;
+  align-items: var(--menu-item-label-align-items);
   cursor: pointer;
-  transition: background-color 0.3s, color 0.3s;
-  word-break: break-word;
-  margin-bottom: 1px;
+  transition: var(--menu-item-label-transition);
+  word-break: var(--menu-item-label-word-break);
 
   background-color: var(--sidebar-item-background-color);
   font-family: var(--sidebar-item-font-family);
   font-size: var(--sidebar-item-font-size);
-  font-weight: var(--font-weight-regular);
-  margin-left: var(--sidebar-offset-left);
-  padding: var(--sidebar-item-padding-vertical) var(--sidebar-item-padding-horizontal);
-  padding-left: calc(
-    var(--sidebar-item-padding-horizontal) + var(--sidebar-group-item-chevron-size) +
-      var(--sidebar-spacing-unit) * 0.5
-  );
+  font-weight: var(--sidebar-item-font-weight);
+  margin: var(--menu-item-label-margin);
+  padding: var(--menu-item-label-padding);
   border-radius: var(--sidebar-item-border-radius);
 
   ${({ active, theme }) =>
     active &&
     `
     color: var(--mobile-menu-item-active-text-color);
-    background-color: var(--mobile-menu-item-active-color);
+    background-color: var(--mobile-menu-item-active-background-color);
     
     ${theme.mediaQueries.medium} {
       color: var(--sidebar-item-active-color);
@@ -40,7 +35,6 @@ export const MenuItemLabel = styled.li.attrs<{ className?: string }>(({ classNam
 
     ${({ theme }) => theme.mediaQueries.medium} {
       color: var(--sidebar-item-hover-color);
-      background-color: var(--sidebar-item-hover-background-color);
     }
   }
 

package/src/components/Menu/MobileMenu.tsx

@@ -5,7 +5,7 @@ import styled from 'styled-components';
 import type { MobileMenuProps } from '@theme/components/Menu/types';
 import { MenuType } from '@theme/components/Menu/constants';
 import { Menu, MenuItemLabel } from '@theme/components/Menu/index';
-import { MobileUserProfile } from '@theme/components/Navbar/MobileUserProfile';
+import { MobileUserProfile } from '@theme/components/Profile/MobileUserProfile';
 import { useCurrentProduct } from '@portal/hooks';
 import { ArrowIcon } from '@theme/icons';
 import { Product } from '@theme/components/Product/Product';
@@ -71,17 +71,17 @@ export function MobileMenu({ className }: MobileMenuProps): JSX.Element | null {
   );
 }
 const MobileMenuWrapper = styled.div`
-  height: calc(100vh - var(--navbar-height));
-  width: 100%;
+  height: var(--mobile-menu-wrapper-height);
+  width: var(--mobile-menu-wrapper-width);
   position: fixed;
-  z-index: var(--z-index-raised);
-  left: 0;
-  top: var(--navbar-height);
+  z-index: var(--mobile-menu-wrapper-z-index);
+  left: var(--mobile-menu-wrapper-left);
+  top: var(--mobile-menu-wrapper-top);
   overflow-x: hidden;
-  transition: 0.5s;
+  transition: var(--mobile-menu-wrapper-transition);
   display: flex;
   flex-direction: column;
-  background: var(--mobile-menu-background);
+  background: var(--mobile-menu-wrapper-background);
 
   ${({ theme }) => theme.mediaQueries.medium} {
     display: none;
@@ -102,27 +102,23 @@ const ScrollableArea = styled.div`
 `;
 
 const MenuWrapper = styled.div`
-  margin: 0 var(--mobile-menu-horizontal-margin);
-  margin-top: var(--mobile-menu-items-margin-top);
-  line-height: 22px;
+  margin: var(--mobile-menu-margin);
+  line-height: var(--mobile-menu-line-height);
   background: var(--mobile-menu-background);
 
   ${MenuItemLabel} {
-    margin: 0;
+    margin: var(--mobile-menu-item-margin);
     border-radius: var(--mobile-menu-item-radius);
-    padding-left: var(--sidebar-item-padding-horizontal);
   }
 `;
 
 export const ControlButton = styled.li`
   display: inline-block;
-  padding: var(--mobile-menu-control-button-padding-vertical)
-    var(--mobile-menu-control-button-padding-horizontal);
-  margin: var(--mobile-menu-control-button-margin-vertical)
-    var(--mobile-menu-control-button-margin-horizontal);
-  text-align: center;
+  padding: var(--mobile-menu-control-button-padding);
+  margin: var(--mobile-menu-control-button-margin);
+  text-align: var(--mobile-menu-control-button-text-align);
   font-size: var(--mobile-menu-control-button-font-size);
-  line-height: 22px;
+  line-height: var(--mobile-menu-control-button-line-height);
   font-weight: var(--mobile-menu-control-button-weight);
   color: var(--mobile-menu-control-button-color);
   cursor: pointer;
@@ -147,10 +143,9 @@ const ControlButtonLabel = styled.span<{ paddingDirection: 'right' | 'left' }>`
 `;
 
 const ProductNameWrapper = styled.div`
-  color: var(--mobile-menu-item-text-color);
-  border-radius: var(--mobile-menu-item-radius);
-  padding-left: var(--sidebar-item-padding-horizontal);
-  border: 1px solid rgba(0, 0, 0, 0.06);
-  padding: 8px 7px;
-  margin: 12px 8px 0 8px;
+  color: var(--menu-product-name-color);
+  border-radius: var(--menu-product-name-border-radius);
+  border: 1px solid var(--menu-product-name-border-color);
+  padding: var(--menu-product-name-padding);
+  margin: var(--menu-product-name-margin);
 `;

package/src/components/Menu/MobileMenuGroup.tsx

@@ -66,7 +66,7 @@ const MenuGroupLabel = styled(MenuItemLabel)<{ active?: boolean; expanded?: bool
     active &&
     `
     color: var(--mobile-menu-item-active-text-color);
-    background-color: var(--mobile-menu-item-active-color);
+    background-color: var(--mobile-menu-item-active-background-color);
   `}
 
   ${({ expanded }) =>

package/src/components/Menu/index.ts

@@ -6,3 +6,4 @@ export * from '@theme/components/Menu/MenuItemLabel';
 export * from '@theme/components/Menu/MenuLink';
 export * from '@theme/components/Menu/MenuLinkItem';
 export * from '@theme/components/Menu/MobileMenuGroup';
+export * from '@theme/components/Menu/styledVariables';

package/src/components/Menu/styledVariables.ts

@@ -0,0 +1,88 @@
+import { css } from 'styled-components';
+
+export const mobileMenu = css`
+  /**
+      * @tokens Mobile Menu icons
+      */
+  --mobile-menu-icons-size: var(--spacing-md); // @presenter Spacing
+  --mobile-menu-search-icon-size: calc(var(--spacing-md) - 2px); // @presenter Spacing
+
+  /**
+      * @tokens Mobile Menu wrapper
+      * */
+  --mobile-menu-wrapper-height: calc(100vh - var(--navbar-height));
+  --mobile-menu-wrapper-width: 100%;
+  --mobile-menu-wrapper-z-index: var(--z-index-raised);
+  --mobile-menu-wrapper-left: 0;
+  --mobile-menu-wrapper-top: var(--navbar-height);
+  --mobile-menu-wrapper-transition: 0.5s;
+  --mobile-menu-wrapper-background: var(--bg-base); // @presenter Color
+
+  /**
+      * @tokens Mobile Menu
+      * */
+  --mobile-menu-margin: var(--mobile-menu-items-margin-top) var(--mobile-menu-horizontal-margin) 0
+    var(--mobile-menu-horizontal-margin);
+  --mobile-menu-line-height: var(--line-height-base); // @presenter LineHeight
+  --mobile-menu-padding-top: var(--spacing-sm); // @presenter Spacing
+  --mobile-menu-items-margin-top: var(--spacing-xxs); // @presenter Spacing
+  --mobile-menu-burger-button-margin: var(--spacing-xs); // @presenter Spacing
+  --mobile-menu-background: var(--bg-base); // @presenter Color
+  --mobile-menu-profile-background: var(--bg-base); // @presenter Color
+  --mobile-menu-profile-border-color: var(--border-secondary); // @presenter Color
+  --mobile-menu-group-padding-right: var(--spacing-base); // @presenter Spacing
+  --mobile-menu-horizontal-margin: var(--spacing-xs); // @presenter Spacing
+  --mobile-menu-item-margin: 0; // @presenter Spacing
+  --mobile-menu-item-nested-offset: var(--spacing-xs); // @presenter Spacing
+  --mobile-menu-item-radius: var(--border-radius-md); // @presenter Spacing
+  --mobile-menu-item-text-color: var(--text-secondary); // @presenter Color
+  --mobile-menu-item-active-background-color: var(--bg-raised); // @presenter Color
+  --mobile-menu-item-active-text-color: var(--text-primary); // @presenter Color
+
+  /**
+      * @tokens Mobile Menu control button
+      * */
+  --mobile-menu-control-button-padding-vertical: 0; // @presenter Spacing
+  --mobile-menu-control-button-padding-horizontal: var(--spacing-xxs); // @presenter Spacing
+  --mobile-menu-control-button-padding: var(--mobile-menu-control-button-padding-vertical) var(--mobile-menu-control-button-padding-horizontal); // @presenter Spacing
+  --mobile-menu-control-button-margin-vertical: 0; // @presenter Spacing
+  --mobile-menu-control-button-margin-horizontal: var(--spacing-xs); // @presenter Spacing
+  --mobile-menu-control-button-margin: var(--mobile-menu-control-button-margin-vertical) var(--mobile-menu-control-button-margin-horizontal); // @presenter Spacing
+  --mobile-menu-control-button-font-size: var(--font-size-base); // @presenter FontSize
+  --mobile-menu-control-button-weight: var(--font-weight-regular); // @presenter FontWeight
+  --mobile-menu-control-button-color: var(--mobile-menu-item-text-color); // @presenter Color
+  --mobile-menu-control-button-hover-color: var(--text-primary); // @presenter Color
+  --mobile-menu-control-button-text-align: center;
+  --mobile-menu-control-button-line-height: var(--line-height-base); // @presenter LineHeight
+
+  /**
+      * @tokens Mobile Menu Login button
+      * */
+  --mobile-menu-login-button-background: var(--color-primary-base); // @presenter Color
+  --mobile-menu-login-button-color: var(--color-primary-text); // @presenter Color
+
+  // @tokens End
+`;
+
+export const menu = css`
+  /**
+    * @tokens Menu
+    */
+  --menu-padding: 0;
+  --menu-margin: 0;
+  --menu-list-style: none;
+  --menu-text-color: var(--sidebar-item-text-color);
+
+  --menu-item-label-align-items: center;
+  --menu-item-label-transition: background-color 0.3s, color 0.3s;
+  --menu-item-label-word-break: break-word;
+  --menu-item-label-margin: 0 var(--sidebar-margin-horizontal);
+  --menu-item-label-padding: var(--sidebar-item-padding-vertical) var(--sidebar-item-padding-horizontal);
+
+  --menu-product-name-color: var(--mobile-menu-item-text-color);
+  --menu-product-name-border-radius: var(--mobile-menu-item-radius);
+  --menu-product-name-border-color: 1px solid rgba(0, 0, 0, 0.06);
+  --menu-product-name-padding: var(--sidebar-item-padding-vertical) var(--sidebar-item-padding-horizontal);
+  --menu-product-name-margin: var(--spacing-sm) var(--spacing-xs) 0 var(--spacing-xs);
+  // @tokens End
+`;

package/src/components/Navbar/Navbar.tsx

@@ -96,15 +96,15 @@ export function NavbarPresentational(props: NavbarPresentationalProps): JSX.Elem
         <ProductPicker />
         <NavbarMenu menuItems={menu as ResolvedConfigLinks} />
         {hideSearch ? null : <Search />}
-        <LanguagePicker onChangeLanguage={changeLanguage} />
+        <LanguagePicker onChangeLanguage={changeLanguage} onlyIcon />
+        <ColorModeSwitcherWrapper isVisible={isOpen}>
+          <ColorModeSwitcher />
+        </ColorModeSwitcherWrapper>
         {hideUserProfile ? null : (
           <AuthUserProfileWrapper>
             <AuthUserProfile />
           </AuthUserProfileWrapper>
         )}
-        <ColorModeSwitcherWrapper isVisible={isOpen}>
-          <ColorModeSwitcher />
-        </ColorModeSwitcherWrapper>
       </NavbarRow>
     </NavbarContainer>
   );
@@ -127,6 +127,8 @@ const AuthUserProfileWrapper = styled.div`
 `;
 
 export const NavbarContainer = styled.nav`
+  border: var(--navbar-border);
+
   --text-color: var(--navbar-text-color);
 
   height: var(--navbar-height);
@@ -135,17 +137,13 @@ export const NavbarContainer = styled.nav`
   align-items: center;
   flex-shrink: 0;
 
-  font-size: 0.875rem;
+  font-size: var(--navbar-font-size);
   position: sticky;
   top: 0;
   z-index: var(--z-index-raised);
-  padding: var(--navbar-item-padding-vertical) var(--navbar-item-padding-horizontal);
+  padding: var(--navbar-padding-vertical) var(--navbar-padding-horizontal);
   background: var(--navbar-background-color);
-  font-family: var(--navbar-item-font-family);
-
-  ${({ theme }) => theme.mediaQueries.medium} {
-    font-size: 1rem;
-  }
+  font-family: var(--navbar-font-family);
 
   ${({ theme }) => theme.mediaQueries.print} {
     background: transparent;
@@ -167,5 +165,6 @@ export const NavbarRow = styled.div`
   margin: 0 auto;
   width: 100%;
 
+  gap: var(--navbar-menu-items-gap);
   max-width: var(--navbar-container-max-width);
 `;

package/src/components/Navbar/NavbarItem.tsx

@@ -91,17 +91,20 @@ export const NavbarMenuItem = styled.li<{ active?: boolean }>`
   display: inline-block;
   padding: var(--navbar-item-padding-vertical) var(--navbar-item-padding-horizontal);
   text-align: center;
-  line-height: 1;
-  font-size: var(--navbar-item-font-size);
+  line-height: var(--navbar-item-line-height);
   border-radius: var(--navbar-item-border-radius);
   font-weight: var(--navbar-item-font-weight);
+
   background: ${({ active }) => active && 'var(--navbar-item-active-background-color)'};
   color: ${({ active }) =>
     active ? 'var(--navbar-item-active-text-color)' : 'var(--navbar-text-color)'};
   &:hover {
     color: var(--navbar-item-hover-text-color);
     text-decoration: var(--navbar-item-hover-text-decoration);
-    background: var(--navbar-item-hover-background-color);
+    background: ${({ active }) =>
+      active
+        ? 'var(--navbar-item-active-background-color)'
+        : 'var(--navbar-item-hover-background-color)'};
     ${NavbarLink} {
       color: var(--navbar-item-hover-text-color);
       text-decoration: var(--navbar-item-hover-text-decoration);

package/src/components/Navbar/NavbarMenu.tsx

@@ -33,9 +33,9 @@ const NavItemsContainer = styled.ul`
   display: none;
   flex-wrap: nowrap;
   align-items: center;
-  justify-content: flex-end;
+  justify-content: var(--navbar-menu-justify-content);
   flex: 1;
-  gap: var(--navbar-item-gap);
+  gap: var(--navbar-menu-items-gap);
 
   ${({ theme }) => theme.mediaQueries.medium} {
     display: flex;

package/src/components/Navbar/index.ts

@@ -1,3 +1,4 @@
 export * from '@theme/components/Navbar/Navbar';
 export * from '@theme/components/Navbar/NavbarItem';
 export * from '@theme/components/Navbar/NavbarMenu';
+export * from '@theme/components/Navbar/styledVariables';

package/src/components/Navbar/styledVariables.ts

@@ -0,0 +1,37 @@
+import { css } from 'styled-components';
+
+export const navbar = css`
+  --navbar-background-color: var(--bg-raised); // @presenter Color
+  --navbar-border-color: var(--border-secondary);
+  --navbar-border: 1px solid var(--navbar-border-color);
+
+  --navbar-text-color: var(--text-secondary); // @presenter Color
+  --navbar-height: 64px; // @presenter Spacing
+  --navbar-font-size: var(--font-size-base);
+  --navbar-padding-horizontal: var(--spacing-xl); // @presenter Spacing
+  --navbar-padding-vertical: 0;
+  --navbar-font-family: var(--font-family-base);
+  --navbar-container-max-width: 100%;
+
+  --navbar-menu-items-gap: var(--spacing-base);
+  --navbar-menu-justify-content: flex-start;
+
+  --navbar-item-font-weight: var(--font-weight-regular);
+
+  --navbar-item-active-text-color: var(--text-primary);
+  --navbar-item-active-text-decoration: none;
+
+  --navbar-item-padding-vertical: var(--spacing-xxs);
+  --navbar-item-padding-horizontal: var(--spacing-sm);
+  --navbar-item-line-height: var(--line-height-base);
+  --navbar-item-border-radius: 32px;
+  --navbar-item-active-background-color: var(--bg-sunken);
+
+  --navbar-item-hover-text-color: var(--text-primary);
+  --navbar-item-hover-text-decoration: none;
+  --navbar-item-hover-background-color: none;
+
+  --navbar-item-icon-width: 1.5em; // @presenter Spacing
+  --navbar-item-icon-height: 1.5em; // @presenter Spacing
+  --navbar-item-icon-margin-right: 0.5em; // @presenter Spacing
+`;