Skip to content

Commit 8bcb187

Browse files
author
Kristiyan Ivanov
authored
Fe/feature/ri 7269 fix major discrepancies between the ds previews and the implementation around the main content under the new navigation (#4784)
* RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - added border above the new navigation * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - updated main content brackgrounds to use the proper colors * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - added borders to the keys list and key details to mimic the new DS * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - removed background for the bottom buttons (add, cancel, save, etc). In the new DS there is no different BG and it only makes it mroe complciated to keep track * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - add padding on top of the search bar to distance it from the new navigation * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - updated the cli row to look like the previews * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - updated spacing under the navigation to be handled in one place * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - fixed paddings for the CLI row * RI-7269 - Fix major discrepancies between the DS previews and the implementation around the main content under the new navigation - Updated uses of theme to be through useTheme, instead of a direct import
1 parent 510f314 commit 8bcb187

File tree

7 files changed

+31
-8
lines changed

7 files changed

+31
-8
lines changed

redisinsight/ui/src/components/bottom-group-components/styles.module.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.groupComponentsWrapper {
22
flex-grow: 1;
33
height: 100%;
4-
padding: 0 16px;
4+
padding: 0 16px 16px 16px;
55
}
66

77
.groupComponents {
@@ -14,8 +14,7 @@
1414
display: flex;
1515
align-items: center;
1616
height: 26px;
17-
line-height: 26px;
18-
border: 1px solid var(--euiColorLightShade);
17+
line-height: 26px;
1918

2019
.surveyLink {
2120
display: flex;

redisinsight/ui/src/components/instance-header/InstanceHeader.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'
22
import { useDispatch, useSelector } from 'react-redux'
33
import { useHistory } from 'react-router-dom'
44
import cx from 'classnames'
5+
import { useTheme } from '@redis-ui/styles'
56

67
import { FeatureFlags, Pages } from 'uiSrc/constants'
78
import { selectOnFocus } from 'uiSrc/utils'
@@ -54,6 +55,7 @@ export interface Props {
5455
}
5556

5657
const InstanceHeader = ({ onChangeDbIndex }: Props) => {
58+
const theme = useTheme()
5759
const {
5860
name = '',
5961
host = '',
@@ -130,7 +132,12 @@ const InstanceHeader = ({ onChangeDbIndex }: Props) => {
130132
}
131133

132134
return (
133-
<div className={cx(styles.container)}>
135+
<div
136+
className={cx(styles.container)}
137+
style={{
138+
borderBottom: theme.components.sideBar.collapsed.borderRight,
139+
}}
140+
>
134141
<Row
135142
responsive
136143
align="center"

redisinsight/ui/src/pages/browser/BrowserPage.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'
44
import cx from 'classnames'
55

66
import { isNumber } from 'lodash'
7+
import { useTheme } from '@redis-ui/styles'
78
import {
89
formatLongName,
910
getDbIndex,
@@ -72,7 +73,7 @@ const isOneSideMode = (isInsightsOpen: boolean) =>
7273

7374
const BrowserPage = () => {
7475
const { instanceId } = useParams<{ instanceId: string }>()
75-
76+
const theme = useTheme()
7677
const {
7778
name: connectedInstanceName,
7879
db = 0,
@@ -330,6 +331,10 @@ const BrowserPage = () => {
330331
arePanelsCollapsed ||
331332
(isBrowserFullScreen && !isRightPanelOpen),
332333
})}
334+
style={{
335+
border: `1px solid ${theme.semantic.color.border.neutral500}`,
336+
borderRadius: `8px`,
337+
}}
333338
>
334339
<UploadModal >{<div>test</div>}</UploadModal>
335340
<BrowserLeftPanel
@@ -353,6 +358,10 @@ const BrowserPage = () => {
353358
[styles.keyDetails]:
354359
arePanelsCollapsed || (isRightPanelOpen && isBrowserFullScreen),
355360
})}
361+
style={{
362+
border: `1px solid ${theme.semantic.color.border.neutral500}`,
363+
borderRadius: `5px`,
364+
}}
356365
>
357366
<BrowserRightPanel
358367
arePanelsCollapsed={arePanelsCollapsed}

redisinsight/ui/src/styles/components/_forms.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
.formFooterBar {
1414
position: absolute;
1515
bottom: 0;
16-
background: var(--browserTableRowEven);
16+
// background: var(--browserTableRowEven);
1717
border-style: solid;
1818
border-width: 0;
1919
border-color: var(--euiColorLightShade);

redisinsight/ui/src/styles/themes/dark_theme/_theme_color.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $euiColorWarningText: #ce4841;
4444
$euiColorWarningLight: #d8ab52;
4545
$euiTextSubduedColor: #b5b6c0;
4646
$euiTextSubduedColorHover: #dfe5ef;
47-
$euiPageBackgroundColor: #010101;
47+
$euiPageBackgroundColor: #121212;
4848
$euiTooltipBackgroundColor: #333d4f;
4949
$euiTooltipTextColor: #ffffff;
5050
$euiTooltipTextSecondColor: #e4e9f1;

redisinsight/ui/src/styles/themes/light_theme/_theme_color.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ $euiColorWarning: #9d6901;
1111
$euiColorWarningText: #9d6901;
1212
$euiTextSubduedColor: #415681;
1313
$euiTextSubduedColorHover: #173369;
14-
$euiPageBackgroundColor: #edf0f5;
14+
$euiPageBackgroundColor: #ffffff;
1515
$euiTooltipBackgroundColor: #ffffff;
1616
$euiTooltipTextColor: #173369;
1717
$euiTooltipTextSecondColor: #395b88;

redisinsight/ui/src/templates/instance-page-template/InstancePageTemplate.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useCallback, useEffect, useRef, useState } from 'react'
22
import { useSelector } from 'react-redux'
3+
import { useTheme } from '@redis-ui/styles'
34
import InstanceHeader from 'uiSrc/components/instance-header'
45
import { ExplorePanelTemplate } from 'uiSrc/templates'
56
import BottomGroupComponents from 'uiSrc/components/bottom-group-components/BottomGroupComponents'
@@ -12,6 +13,7 @@ import {
1213
ResizableContainer,
1314
ResizablePanel,
1415
ResizablePanelHandle,
16+
Spacer,
1517
} from 'uiSrc/components/base/layout'
1618
import { ImperativePanelGroupHandle } from 'uiSrc/components/base/layout/resize'
1719
import { AppNavigation } from 'uiSrc/components'
@@ -51,6 +53,7 @@ const roundUpSizes = (sizes: number[]) => [
5153

5254
const InstancePageTemplate = (props: Props) => {
5355
const { children } = props
56+
const theme = useTheme()
5457
const [sizes, setSizes] = useState<number[]>(getDefaultSizes())
5558

5659
const { isShowCli, isShowHelper } = useSelector(cliSettingsSelector)
@@ -100,6 +103,7 @@ const InstancePageTemplate = (props: Props) => {
100103
<>
101104
<InstanceHeader />
102105
<AppNavigation actions={actions} onChange={() => setActions(null)} />
106+
<Spacer size="m" />
103107
<ResizableContainer
104108
ref={ref}
105109
direction="vertical"
@@ -126,11 +130,15 @@ const InstancePageTemplate = (props: Props) => {
126130
data-testid="resize-btn-browser-cli"
127131
style={{ display: isShowBottomGroup ? 'inherit' : 'none' }}
128132
/>
133+
<Spacer size="m" />
129134
<ResizablePanel
130135
id={secondPanelId}
131136
defaultSize={isShowBottomGroup ? sizes[1] : sizeBottomCollapsed}
132137
minSize={isShowBottomGroup ? 20 : 0}
133138
data-testid={secondPanelId}
139+
style={{
140+
borderTop: `1px solid ${theme.semantic.color.border.neutral500}`,
141+
}}
134142
>
135143
<BottomGroupComponents />
136144
</ResizablePanel>

0 commit comments

Comments
 (0)