Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { setDBConfigStorageField } from 'uiSrc/services'
import { ConfigDBStorageItem } from 'uiSrc/constants/storage'
import { FeatureFlagComponent } from 'uiSrc/components'
import { Spacer } from 'uiSrc/components/base/layout/spacer'
import { Row } from 'uiSrc/components/base/layout/flex'
import {
PrimaryButton,
SecondaryButton,
Expand Down Expand Up @@ -67,7 +68,7 @@ const RunConfirmationPopover = ({ onApply }: Props) => {
aria-label="checkbox do not show agan"
/>
<div className={styles.popoverFooter}>
<div>
<Row gap="m" justify="end">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bonus Points: Not related to the changes of the popover colors, but I fixed this minimal spacing issue as well.

Before After
Image Image

<FeatureFlagComponent name={FeatureFlags.envDependent}>
<SecondaryButton
size="s"
Expand All @@ -86,7 +87,7 @@ const RunConfirmationPopover = ({ onApply }: Props) => {
>
Run
</PrimaryButton>
</div>
</Row>
</div>
</>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
.popover {
min-width: 380px !important;
}

.buttonWrapper {
.loadDataBtn {
height: 36px !important;

:global(.euiButton__text) {
font-size: 14px !important;
font-weight: 400 !important;
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -261,24 +261,30 @@ const RemoveListElements = (props: Props) => {
/>
</FormField>
</FlexItem>
<FlexItem grow style={{ width: '100%' }}>
<FormField
additionalText={!canRemoveMultiple ? InfoBoxPopover() : <></>}
>
<TextInput
name={config.count.name}
id={config.count.name}
maxLength={200}
placeholder={config.count.placeholder}
value={count}
data-testid="count-input"
autoComplete="off"
onChange={handleCountChange}
ref={countInput}
disabled={!canRemoveMultiple}
/>
</FormField>
</FlexItem>
<Row grow>
<FlexItem grow>
<FormField>
<TextInput
name={config.count.name}
id={config.count.name}
maxLength={200}
placeholder={config.count.placeholder}
value={count}
data-testid="count-input"
autoComplete="off"
onChange={handleCountChange}
ref={countInput}
disabled={!canRemoveMultiple}
/>
</FormField>
</FlexItem>

{!canRemoveMultiple ? (
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bonus Points: Not related to the changes of the popover colors, but I fixed this minimal spacing issue as well, so it will look like in the old version, before the EUI replacement.

Old Before After
Image Image Image

<FlexItem>{InfoBoxPopover()}</FlexItem>
) : (
<></>
)}
</Row>
</Row>
</FlexItem>
</EntryContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
} from 'uiSrc/components/base/forms/buttons'
import { Text } from 'uiSrc/components/base/text'
import { RiPopover } from 'uiSrc/components/base'
import styles from '../../styles.module.scss'
import { Row } from 'uiSrc/components/base/layout/flex'
import { Spacer } from 'uiSrc/components/base/layout'

interface ConfirmOverwriteProps {
isOpen: boolean
Expand Down Expand Up @@ -37,8 +38,8 @@ const ConfirmOverwrite = ({
You already have the same JSON key. If you proceed, a value of the
existing JSON key will be overwritten.
</Text>

<div className={styles.confirmDialogActions}>
<Spacer size="l" />
<Row justify="end" gap="m">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bonus Points: Not related to the changes of the popover colors, but I fixed this minimal spacing issue as well.

Before After

<SecondaryButton
aria-label="Cancel"
size="small"
Expand All @@ -56,7 +57,7 @@ const ConfirmOverwrite = ({
>
Overwrite
</PrimaryButton>
</div>
</Row>
</RiPopover>
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,20 +269,6 @@
max-width: none;
}

.confirmDialogActions {
display: flex;
justify-content: flex-end;
margin-top: 16px;

button {
margin-left: 8px;

&:first-of-type {
margin-left: 0;
}
}
}

.actions {
margin-top: 1em;
display: flex;
Expand Down
17 changes: 0 additions & 17 deletions redisinsight/ui/src/styles/components/_popover.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,5 @@
}

.popoverLikeTooltip {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual change related to this PR. Sorry for the other minor fixes and refactoring.

border: none;
max-width: 267px !important;
background-color: var(--euiTooltipBackgroundColor) !important;
.euiPopover__panelArrow.euiPopover__panelArrow--bottom:after {
border-bottom-color: var(--euiTooltipBackgroundColor) !important;
}

.euiPopover__panelArrow.euiPopover__panelArrow--right:after {
border-right-color: var(--euiTooltipBackgroundColor) !important;
}

.euiPopover__panelArrow.euiPopover__panelArrow--left:after {
border-left-color: var(--euiTooltipBackgroundColor) !important;
}

.euiPopover__panelArrow.euiPopover__panelArrow--top:after {
border-top-color: var(--euiTooltipBackgroundColor) !important;
}
}
Loading