diff --git a/packages/bruno-app/src/components/EditableTable/StyledWrapper.js b/packages/bruno-app/src/components/EditableTable/StyledWrapper.js index 890f0522e..6f0c79426 100644 --- a/packages/bruno-app/src/components/EditableTable/StyledWrapper.js +++ b/packages/bruno-app/src/components/EditableTable/StyledWrapper.js @@ -63,7 +63,7 @@ const StyledWrapper = styled.div` height: 100%; cursor: col-resize; background: transparent; - z-index: 100; + z-index: 10; &:hover, &.resizing { diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js index b31dc655a..4f6a26a12 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/ConfirmCollectionCloseDrafts.js @@ -10,6 +10,7 @@ import { IconAlertTriangle, IconDeviceFloppy } from '@tabler/icons'; import Modal from 'components/Modal'; import toast from 'react-hot-toast'; import Button from 'ui/Button'; +import StyledWrapper from './StyledWrapper'; const MAX_UNSAVED_REQUESTS_TO_SHOW = 5; @@ -108,103 +109,105 @@ const ConfirmCollectionCloseDrafts = ({ onClose, collection, collectionUid }) => } return ( - -
- -

Hold on..

-
-

- You have unsaved changes in {allDrafts.length}{' '} - {pluralizeWord('request', allDrafts.length)}. -

- - {/* Regular (saved) requests with changes */} - {currentDrafts.length > 0 && ( -
-

- Saved {pluralizeWord('Request', currentDrafts.length)} ({currentDrafts.length}) -

- - {currentDrafts.length > MAX_UNSAVED_REQUESTS_TO_SHOW && ( -

- ...{currentDrafts.length - MAX_UNSAVED_REQUESTS_TO_SHOW} additional{' '} - {pluralizeWord('request', currentDrafts.length - MAX_UNSAVED_REQUESTS_TO_SHOW)} not shown -

- )} + + +
+ +

Hold on..

- )} +

+ You have unsaved changes in {allDrafts.length}{' '} + {pluralizeWord('request', allDrafts.length)}. +

- {/* Transient (unsaved) requests */} - {currentTransientDrafts.length > 0 && ( -
-

- Transient {pluralizeWord('Request', currentTransientDrafts.length)} ({currentTransientDrafts.length}) -

-

- These requests need to be saved individually before closing the collection. -

-
- {currentTransientDrafts.map((item) => { - return ( -
- {item.name} - -
- ); - })} + {item.name} + +
+ ); + })} +
+
+ )} + +
+
+ +
+
+ +
- )} - -
-
- -
-
- - -
-
-
+ + ); }; diff --git a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js index 5be3b5812..5e6539805 100644 --- a/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js +++ b/packages/bruno-app/src/components/Sidebar/Collections/Collection/RemoveCollection/StyledWrapper.js @@ -12,6 +12,9 @@ const StyledWrapper = styled.div` color: ${(props) => props.theme.text}; margin-bottom: 4px; cursor: default !important; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; &:hover { background: none !important; } @@ -24,6 +27,24 @@ const StyledWrapper = styled.div` .warning-icon { color: ${(props) => props.theme.status.warning.text}; } + + .warning-text { + color: ${(props) => props.theme.status.warning.text}; + } + .draft-list-item { + color: ${(props) => props.theme.colors.text.muted}; + } + .transient-hint { + color: ${(props) => props.theme.colors.text.warning}; + } + .transient-item { + background-color: ${(props) => props.theme.background.surface0}; + border: 1px solid ${(props) => props.theme.border.border0}; + border-radius: 4px; + } + .transient-item-name { + color: ${(props) => props.theme.text}; + } `; export default StyledWrapper;