Loading frontend/src/actionlog/ActionLog/index.tsx +0 −9 Original line number Diff line number Diff line Loading @@ -16,17 +16,12 @@ import { const view = css` height: 100%; <<<<<<< HEAD ======= overflow-y: auto; >>>>>>> 8dfb294da9e318f92144f8a54f9c97ce9982a5ea display: flex; flex-direction: column; justify-content: space-between; ` const bottom = css` <<<<<<< HEAD position: sticky; bottom: 1rem; right: 1rem; Loading @@ -44,10 +39,6 @@ const bottom = css` const full = css` height: 100vh; ======= display: flex; justify-content: flex-end; >>>>>>> 8dfb294da9e318f92144f8a54f9c97ce9982a5ea ` interface ActionLogProps { Loading frontend/src/actionlog/ToolAction/components/Form2.tsx +2 −2 Original line number Diff line number Diff line import { Button, ControlGroup, FormGroup, Icon, InputGroup } from '@blueprintjs/core' import { Button, ControlGroup, Icon, InputGroup } from '@blueprintjs/core' import { css } from '@emotion/css' import useApolloClient from '@inject/graphql/client/useApolloClient' import { Tool } from '@inject/graphql/fragments/Tool.generated' import { usePerformTeamToolAction } from '@inject/graphql/mutations/PerformTeamToolAction.generated' import type { FC, KeyboardEventHandler } from 'react' import type { FC } from 'react' import { useEffect, useMemo, useRef } from 'react' import { selectedTool, useSelectedTool } from '../selectedToolVar' Loading Loading
frontend/src/actionlog/ActionLog/index.tsx +0 −9 Original line number Diff line number Diff line Loading @@ -16,17 +16,12 @@ import { const view = css` height: 100%; <<<<<<< HEAD ======= overflow-y: auto; >>>>>>> 8dfb294da9e318f92144f8a54f9c97ce9982a5ea display: flex; flex-direction: column; justify-content: space-between; ` const bottom = css` <<<<<<< HEAD position: sticky; bottom: 1rem; right: 1rem; Loading @@ -44,10 +39,6 @@ const bottom = css` const full = css` height: 100vh; ======= display: flex; justify-content: flex-end; >>>>>>> 8dfb294da9e318f92144f8a54f9c97ce9982a5ea ` interface ActionLogProps { Loading
frontend/src/actionlog/ToolAction/components/Form2.tsx +2 −2 Original line number Diff line number Diff line import { Button, ControlGroup, FormGroup, Icon, InputGroup } from '@blueprintjs/core' import { Button, ControlGroup, Icon, InputGroup } from '@blueprintjs/core' import { css } from '@emotion/css' import useApolloClient from '@inject/graphql/client/useApolloClient' import { Tool } from '@inject/graphql/fragments/Tool.generated' import { usePerformTeamToolAction } from '@inject/graphql/mutations/PerformTeamToolAction.generated' import type { FC, KeyboardEventHandler } from 'react' import type { FC } from 'react' import { useEffect, useMemo, useRef } from 'react' import { selectedTool, useSelectedTool } from '../selectedToolVar' Loading