diff --git a/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.module.scss b/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.module.scss index 3daf1da12f..55d6315815 100644 --- a/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.module.scss +++ b/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.module.scss @@ -7,8 +7,9 @@ display: flex; align-items: center; height: 100%; + padding-bottom: 16px; // to match antd nav margin-bottom button { - color: currentColor; + height: 100%; } } @@ -19,7 +20,4 @@ .menu { color: currentColor; - // border: none; - // background-color: transparent; - // margin: 8px; } diff --git a/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx b/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx index b88fa64224..45ecc4fe5d 100644 --- a/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx +++ b/web/components/action-buttons/ActionButtonMenu/ActionButtonMenu.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { Button, Dropdown, Menu, Space } from 'antd'; -import { DownOutlined, StarOutlined } from '@ant-design/icons'; +import { Button, Dropdown, Menu } from 'antd'; +import { DashOutlined, EllipsisOutlined } from '@ant-design/icons'; import styles from './ActionButtonMenu.module.scss'; import { ExternalAction } from '../../../interfaces/external-action'; @@ -31,14 +31,14 @@ export const ActionButtonMenu: FC = ({ const menu = ; return ( - +
- +
); diff --git a/web/components/ui/Content/Content.tsx b/web/components/ui/Content/Content.tsx index 593e228509..ef8a9645dd 100644 --- a/web/components/ui/Content/Content.tsx +++ b/web/components/ui/Content/Content.tsx @@ -159,7 +159,7 @@ const MobileContent = ({ const replacementTabBar = (props, DefaultTabBar) => (
- +
); diff --git a/web/styles/ant-overrides.scss b/web/styles/ant-overrides.scss index 4400e7ba55..08c52b930a 100644 --- a/web/styles/ant-overrides.scss +++ b/web/styles/ant-overrides.scss @@ -1,5 +1,5 @@ /* ------------------------- // - HEADER +HEADER // ------------------------- */ .ant-layout-header { @@ -7,18 +7,42 @@ height: auto; } /* ------------------------- // - BUTTONS +BUTTONS // ------------------------- */ -.ant-btn { - height: 2rem; +.ant-btn[disabled] { + background-color: var(--theme-color-components-secondary-button-background-disabled); + color: var(--theme-color-components-secondary-button-text-disabled); + border-color: var(--theme-color-components-secondary-button-border-disabled); + &:hover, + &:focus { + background-color: var(--theme-color-components-secondary-button-background-disabled); + color: var(--theme-color-components-secondary-button-text-disabled); + border-color: var(--theme-color-components-secondary-button-border-disabled); + } +} +.ant-btn-default { + color: currentColor; + border-width: 2px; + border-color: transparent; + border-radius: .15rem; + background-color: rgba(0,0,0,.1); + &:hover, + &:focus { + color: currentColor; + border-color: rgba(0,0,0,.55); + background-color: var(--theme-color-components-secondary-button-background); + } +} + +.ant-btn-primary { + height: 2rem; font-size: 0.85rem; font-weight: bold; border-width: 2px; border-radius: var(--theme-rounded-corners); color: var(--theme-color-components-primary-button-text); - border-color: var(--theme-color-action); &:hover, &:focus { @@ -33,20 +57,6 @@ &[ant-click-animating-without-extra-node]:after { animation: 0s !important; } -} -.ant-btn[disabled] { - background-color: var(--theme-color-components-secondary-button-background-disabled); - color: var(--theme-color-components-secondary-button-text-disabled); - border-color: var(--theme-color-components-secondary-button-border-disabled); - &:hover, - &:focus { - background-color: var(--theme-color-components-secondary-button-background-disabled); - color: var(--theme-color-components-secondary-button-text-disabled); - border-color: var(--theme-color-components-secondary-button-border-disabled); - } -} - -.ant-btn-primary { background-color: var(--theme-color-components-primary-button-background); color: var(--theme-color-components-primary-button-text); border-color: var(--theme-color-components-primary-button-background); @@ -84,7 +94,7 @@ } /* ------------------------- // - DROPDOWN +DROPDOWN // ------------------------- */ .ant-dropdown-menu {