From d231628358da163a667ee24c25207e4e80620912 Mon Sep 17 00:00:00 2001 From: Marcell Toth Date: Wed, 13 May 2020 13:31:33 +0300 Subject: [PATCH] feat: apply toc changes from stoplightio/platform-internal#2425 (#157) --- src/TableOfContents/index.tsx | 9 +++++---- src/styles/components/TableOfContents/_base.scss | 11 +++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/TableOfContents/index.tsx b/src/TableOfContents/index.tsx index bf76e18c..b1df307e 100644 --- a/src/TableOfContents/index.tsx +++ b/src/TableOfContents/index.tsx @@ -17,6 +17,7 @@ export type TableOfContentsItem = { type?: 'divider' | 'group' | 'item'; icon?: FAIconProp; activeIcon?: FAIconProp; + iconColor?: string; isLoading?: boolean; isDisabled?: boolean; showSkeleton?: boolean; @@ -256,7 +257,7 @@ const computeTableOfContentsItemProps = ({ 'TableOfContentsItem--child border-gray-3 dark:border-lighten-3': isChild, }), style: { - marginLeft: depth * 15, + marginLeft: depth * 24, }, }; }; @@ -308,8 +309,8 @@ const TableOfContentsItemInner = ({ 'text-gray-7 dark:text-white': isActive, 'border-primary text-blue-6': isSelected, - 'text-gray-6 dark:text-gray-6 tracking-wide text-sm font-semibold h-12': isDivider, - 'text-gray-6 dark:text-gray-5': !isDivider && !isSelected && !isActive, + 'text-gray-6 dark:text-gray-6 font-semibold h-10': isDivider, + 'text-gray-5 dark:text-gray-5 hover:text-gray-6': !isDivider && !isSelected && !isActive, }, ); @@ -356,7 +357,7 @@ const TableOfContentsItemInner = ({ {loadingElem} {actionElem} {isGroup && ( - + )} {item.footer} diff --git a/src/styles/components/TableOfContents/_base.scss b/src/styles/components/TableOfContents/_base.scss index df998c6f..52a04738 100644 --- a/src/styles/components/TableOfContents/_base.scss +++ b/src/styles/components/TableOfContents/_base.scss @@ -9,7 +9,7 @@ } &__inner { - padding: 6px 12px 6px; + padding: 6px 22px 6px; margin-top: 1px; margin-bottom: 1px; } @@ -26,18 +26,25 @@ } } + &--child { + .TableOfContentsItem__inner { + padding-left: 15px; + } + } + &--divider { &:first-child { margin-top: -5px; } &:not(:first-child) { - margin-top: 5px; + margin-top: 12px; } .TableOfContentsItem__name { line-height: 1.2; text-transform: uppercase; + font-size: 12px; } } }