Merge branch 'develop' into feature/company-info-settings

packages/common/components/Article/styled-article.js

@@ -318,7 +318,7 @@ const StyledUserName = styled.div`
 `;
 
 const StyledProfileWrapper = styled.div`
-  z-index: 301;
+  z-index: 209;
   position: fixed;
   bottom: 0;
   left: 0;

packages/common/components/ColorTheme/styled/catalogItem.js

@@ -26,6 +26,11 @@ const getDefaultStyles = ({ $currentColorScheme, isActive, theme }) =>
           theme.isBase &&
           $currentColorScheme.accentColor} !important;
         }
+        circle {
+          fill: ${isActive &&
+          theme.isBase &&
+          $currentColorScheme.accentColor} !important;
+        }
       }
 
       &:hover {

packages/common/components/Navigation/sub-components/drop-box.js

@@ -29,13 +29,14 @@ const StyledBox = styled.div`
   padding: ${isMobile ? "0 16px " : "0 20px"};
   padding-top: 18px;
 
-  ${(props) => `width: ${props.dropBoxWidth}px;`};
+  width: unset;
 
   height: ${(props) => (props.height ? `${props.height}px` : "fit-content")};
   max-height: calc(100vh - 48px);
 
   z-index: 401;
-  display: flex;
+  display: table;
+  margin: auto;
   flex-direction: column;
 
   background: ${(props) => props.theme.navigation.background};
@@ -44,13 +45,15 @@ const StyledBox = styled.div`
   border-radius: 0px 0px 6px 6px;
 
   @media ${tablet} {
+    width: ${({ dropBoxWidth }) => dropBoxWidth + "px"};
     left: -16px;
-    padding: 0 16px 0 16px;
+    padding: 0 16px;
     padding-top: 14px;
   }
 
   ${isMobile &&
   css`
+    width: ${({ dropBoxWidth }) => dropBoxWidth + "px"};
     padding-top: 14px;
   `}
 

packages/components/catalog-item/index.js

@@ -86,7 +86,7 @@ const CatalogItem = (props) => {
           isDragActive={isDragActive}
           onClick={onClickAction}
           onMouseUp={onMouseUpAction}
-        ></StyledCatalogItemSibling>
+        />
 
         <StyledCatalogItemImg isActive={isActive}>
           <ReactSVG className="icon" src={icon} />

packages/components/themes/base.js

@@ -1886,7 +1886,7 @@ const Base = {
       fontWeight: 600,
       tablet: {
         marginLeft: "12px",
-        lineHeight: "16px",
+        lineHeight: "20px",
         fontSize: "15px",
         fontWeight: "600",
       },

packages/components/themes/dark.js

@@ -1883,7 +1883,7 @@ const Dark = {
       fontWeight: 600,
       tablet: {
         marginLeft: "12px",
-        lineHeight: "16px",
+        lineHeight: "20px",
         fontSize: "14px",
         fontWeight: "600",
       },