Skip to content

Commit 37f367a

Browse files
committed
figma changes
1 parent afbde85 commit 37f367a

File tree

9 files changed

+47
-21
lines changed

9 files changed

+47
-21
lines changed

public/icons/check.svg

+4
Loading

src/app/common/css/redis-core.scss

+4
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,8 @@
124124
--orange-500: #b37a1e;
125125
--orange-600: #664611;
126126
--orange-700: #332309;
127+
128+
--gradient-g-0: #f0f0f0;
129+
--gradient-g-1: #80dbff;
130+
--gradient-g-2: #0d2532;
127131
}

src/app/common/css/theme-redis.scss

+7-6
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@
1919
--comp-icon-button-hover-bg-clr: var(--hyper-09);
2020
--comp-icon-button-active-bg-clr: var(--hyper-08);
2121

22-
--comp-loader-bg-clr: var(--dusk-06);
23-
--comp-loader-gradient1: var(--green-400);
24-
--comp-loader-gradient2: var(--purple-06);
22+
--comp-loader-bg-clr: var(--gradient-g-0);
23+
--comp-loader-gradient1: var(--gradient-g-1);
24+
--comp-loader-gradient2: var(--gradient-g-2);
2525

2626
--comp-modal-popup-bg-clr: var(--dusk-01);
2727
--comp-modal-popup-txt-clr: var(--dusk-04);
2828
--comp-modal-popup-close-txt-clr: var(--dusk-06);
2929

30-
--comp-tooltip-bg-clr: var(--dusk-07);
31-
--comp-tooltip-txt-clr: var(--white-base);
30+
--comp-tooltip-bg-clr: var(--white-base);
31+
--comp-tooltip-txt-clr: var(--dusk-08);
32+
--comp-tooltip-border-clr: var(--dusk-03);
3233

3334
--pg-main-header-bg-clr: var(--white-base);
3435
--pg-main-header-txt-clr: var(--midnight-base);
@@ -54,7 +55,7 @@
5455

5556
--pg-result-error-txt-clr: var(--hyper-05);
5657

57-
--pg-card-panel-resize-handle-bg-clr: var(--gray-04);
58+
--pg-card-panel-resize-handle-bg-clr: transparent; //var(--gray-04);
5859
--pg-card-panel-box-shadow-clr: var(--gray-03);
5960

6061
--pg-query-template-bg-clr: var(--gray-02);

src/app/common/css/variables.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ body {
4040

4141
--border: var(--primary-10);
4242

43-
--comp-loader-height: 4px;
43+
--comp-loader-height: 2px;
4444

4545
--pg-sidebar-width: 250px;
4646
--pg-main-header-height: 50px;

src/app/components/CodeMirrorEditor/redis-syntax-support.ts

+15-6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
syntaxHighlighting,
77
StreamLanguage,
88
} from "@codemirror/language";
9+
import { EditorView } from "@codemirror/view";
910
import { tags } from "@lezer/highlight";
1011

1112
const redisCommands = [
@@ -71,30 +72,38 @@ const redisHighlightStyle = HighlightStyle.define([
7172
// Commands or keywords
7273
{
7374
tag: tags.keyword,
74-
color: "#B76BE2",
75+
color: "#F28100",
7576
//fontWeight: "bold",
7677
},
7778

7879
// Variables and identifiers
79-
{ tag: tags.variableName, color: "#1A5FB4" },
80+
{ tag: tags.variableName, color: "#8F2EC4" },
8081

8182
// Numbers
82-
{ tag: tags.number, color: "#26A269" },
83+
{ tag: tags.number, color: "#1750EB" },
8384

8485
// JSON paths ($.productId)
85-
{ tag: tags.propertyName, color: "#C64600" },
86+
{ tag: tags.propertyName, color: "#FF16B4" },
8687

8788
// Strings (quoted values)
88-
{ tag: tags.string, color: "#EB352A" },
89+
{ tag: tags.string, color: "#018800" },
8990

9091
// Brackets and delimiters
91-
{ tag: tags.bracket, color: "#5E5C64" },
92+
{ tag: tags.bracket, color: "#091A23" },
9293

9394
// Comments
9495
{ tag: tags.comment, color: "#939598" },
9596
]);
9697

98+
// Add selection theme configuration
99+
const selectionTheme = EditorView.theme({
100+
"&.cm-focused .cm-selectionBackground, .cm-selectionBackground": {
101+
backgroundColor: "#E9E9E9 !important",
102+
},
103+
});
104+
97105
// Language support with highlighting
98106
export const redisSyntaxSupport = new LanguageSupport(redisLanguage, [
99107
syntaxHighlighting(redisHighlightStyle),
108+
selectionTheme,
100109
]);

src/app/components/TooltipIcon/index.scss

+6-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
color: var(--comp-tooltip-txt-clr) !important;
77
background-color: var(--comp-tooltip-bg-clr) !important;
88
border-radius: var(--radius-12) !important;
9+
border: 1px solid var(--comp-tooltip-border-clr) !important;
910
font-size: var(--font-size-12) !important;
10-
font-weight: 700 !important;
1111
z-index: 1000 !important;
1212
}
1313

14+
.comp-custom-tooltip-arrow {
15+
border-bottom: 1px solid var(--comp-tooltip-border-clr) !important;
16+
border-right: 1px solid var(--comp-tooltip-border-clr) !important;
17+
}
18+
1419
.comp-tooltip-icon-img {
1520
position: relative;
1621
}

src/app/components/TooltipIcon/index.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ enum TooltipIconType {
1111

1212
interface ITooltipIconProps {
1313
id?: string;
14+
className?: string;
1415
iconCls?: string;
1516
imgSrc?: string;
1617
imgWidth?: number | string;
@@ -24,27 +25,27 @@ const tooltipOptions: ITooltip = {
2425
// place: 'right',
2526
// variant: 'light',
2627
delayShow: 200,
27-
className: 'comp-custom-tooltip',
28-
//classNameArrow: 'comp-custom-tooltip-arrow'
28+
className: 'comp-custom-tooltip font-regular',
29+
classNameArrow: 'comp-custom-tooltip-arrow'
2930
}
3031

3132
const generateTooltipId = () => {
3233
return `tooltip-id-${Math.random().toString(36).substring(2, 15)}`;
3334
}
3435

35-
const TooltipIcon = ({ id, iconCls, imgSrc, imgWidth = "1rem", imgHeight = "1rem", title, titleType = TooltipIconType.text, onClick }: ITooltipIconProps) => {
36+
const TooltipIcon = ({ id, iconCls, imgSrc, imgWidth = "1rem", imgHeight = "1rem", title, titleType = TooltipIconType.text, onClick, className }: ITooltipIconProps) => {
3637
const [tooltipId, setTooltipId] = useState(id || generateTooltipId());
3738
return <>
3839
{iconCls && (
39-
<i className={`comp-tooltip-icon ${iconCls}`}
40+
<i className={`comp-tooltip-icon ${iconCls} ${className}`}
4041
onClick={onClick}
4142
data-tooltip-id={tooltipId}
4243
data-tooltip-content={titleType === TooltipIconType.text ? title : undefined}
4344
data-tooltip-html={titleType === TooltipIconType.html ? title : undefined}
4445
></i>
4546
)}
4647
{imgSrc && (
47-
<div className='comp-tooltip-icon-img' style={{ width: imgWidth, height: imgHeight }} >
48+
<div className={`comp-tooltip-icon-img ${className}`} style={{ width: imgWidth, height: imgHeight }} >
4849
<Image src={imgSrc} alt={title} fill
4950
onClick={onClick}
5051
data-tooltip-id={tooltipId}

src/app/page-components/PgCardPanel/PgCardHeader.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const PgCardHeader = ({ headerTitle, infoIconContent, infoIconContentType, showC
5959
}
6060

6161
{showCopyIcon &&
62-
(copied ? <i className="fa fa-check"></i> : <TooltipIcon imgSrc="/icons/copy.svg" imgWidth="1.25rem" imgHeight="1.25rem" title="Copy" onClick={() => handleClick(HeaderIcon.copy)} />)}
62+
(copied ? <TooltipIcon imgSrc="/icons/check.svg" imgWidth="1.25rem" imgHeight="1.25rem" title="Copied" /> : <TooltipIcon imgSrc="/icons/copy.svg" imgWidth="1.25rem" imgHeight="1.25rem" title="Copy" onClick={() => handleClick(HeaderIcon.copy)} />)}
6363

6464
</div>
6565
</div>

src/app/page-components/PgQueryTemplate/index.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import Highlighter from 'react-highlight-words';
88
import { usePlaygroundContext } from "../PlaygroundContext";
99
import Loader from "@/app/components/Loader";
1010
import ImageIcon from "@/app/components/ImageIcon";
11+
import TooltipIcon from '@/app/components/TooltipIcon';
1112

1213
interface IQueryTemplateProps {
1314
onClose?: () => void;
@@ -106,7 +107,8 @@ const PgQueryTemplate = ({ onClose }: IQueryTemplateProps) => {
106107
{/* <i className="fa fa-search"></i> */}
107108
<ImageIcon imgSrc="/icons/search.svg" alt={labels.searchPlaceholder} imgWidth="1.125rem" imgHeight="1.125rem" />
108109
<input type="text" placeholder={labels.searchPlaceholder} onChange={handleSearchChange} className="query-search-input" value={searchValue} />
109-
{searchValue && <i className="fa fa-times clear-icon" onClick={handleClearSearch}></i>}
110+
{/* {searchValue && <i className="fa fa-times clear-icon" onClick={handleClearSearch}></i>} */}
111+
{searchValue && <TooltipIcon imgSrc="/icons/close.svg" className='clear-icon' imgWidth="1rem" imgHeight="1rem" title="Clear" onClick={handleClearSearch} />}
110112
</div>
111113
</div>
112114
<div className="query-sidebar-content">

0 commit comments

Comments
 (0)