Skip to content

Commit 2453a01

Browse files
AmirAllayarovSofteqAmirAllayarovSofteq
authored
Merge pull request #1279 from RedisInsight/fe/bugfix/RI-3621_table_styles
Fe/bugfix/ri 3621 table styles
2 parents 6735f6a + b3b6086 commit 2453a01

File tree

5 files changed

+23
-29
lines changed

5 files changed

+23
-29
lines changed

‎redisinsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/styles.module.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
margin: auto;
2020

2121
.title {
22-
font: normal normal 500 18px/24px Graphik !important;
22+
font: normal normal 500 18px/24px Graphik, sans-serif !important;
2323
padding-bottom: 12px;
2424
}
2525

‎redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ const Table = (props: Props) => {
7777
width: '10%',
7878
align: 'left',
7979
sortable: true,
80-
className: 'dataType',
8180
render: (type: string) => (
8281
<div className={styles.badgesContainer}>
8382
<GroupBadge key={type} type={type} className={styles.badge} />
@@ -99,6 +98,7 @@ const Table = (props: Props) => {
9998
return (
10099
<div data-testid="top-keys-table-name" className={cx(styles.delimiter, 'truncateText')}>
101100
<EuiToolTip
101+
title="Key Name"
102102
anchorClassName={styles.tooltip}
103103
position="bottom"
104104
content={tooltipContent}

‎redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/styles.module.scss‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818

1919
:global(.euiButton__text) {
20-
font: normal normal normal 13px/18px Graphik !important;
20+
font: normal normal normal 13px/17px Graphik, sans-serif !important;
2121
}
2222

2323
&.activeBtn:global(.euiButton.euiButton-isDisabled.euiButton--fill.euiButton--secondary),
@@ -99,7 +99,7 @@
9999
}
100100

101101
.euiTableCellContent__text {
102-
font: normal normal normal 12px/18px Graphik, sans-serif;
102+
font: normal normal normal 12px/17px Graphik, sans-serif;
103103
}
104104
}
105105

@@ -111,11 +111,7 @@
111111

112112
.euiTableRowCell .euiTableCellContent {
113113
padding: 10px;
114-
font: normal normal normal 14px/24px Graphik;
115-
116-
&:global(.dataType) {
117-
padding: 10px 6px 2px;
118-
}
114+
font: normal normal normal 14px/17px Graphik, sans-serif;
119115
}
120116

121117
.euiTableHeaderButton.euiTableHeaderButton-isSorted {
@@ -130,7 +126,7 @@
130126
}
131127

132128
.valueUnit {
133-
font: normal normal normal 12px/18px Graphik, sans-serif !important;
129+
font: normal normal normal 12px/17px Graphik, sans-serif !important;
134130
margin-left: 4px;
135131
color: var(--euiColorMediumShade) !important;
136132
}
@@ -151,7 +147,7 @@
151147
:global(.euiTableCellContent) .delimiter span {
152148
cursor: pointer;
153149
color: var(--buttonSecondaryTextColor);
154-
font: normal normal normal 13px/18px Graphik;
150+
font: normal normal normal 13px/17px Graphik, sans-serif;
155151

156152
&:hover {
157153
text-decoration: underline;
@@ -160,19 +156,15 @@
160156

161157
:global(.euiTableCellContent) .count {
162158
color: var(--euiTextSubduedColor);
163-
font: normal normal 500 16px/18px Inconsolata;
159+
font: normal normal 500 16px/17px Inconsolata;
164160
}
165161

166162
.badgesContainer {
167163
display: flex;
168164
flex-wrap: wrap;
169165

170-
& .badge {
171-
margin: 0 7px 8px;
172-
}
173-
174166
:global(.euiBadge) span {
175-
font: normal normal normal 12px/16px Graphik;
167+
font: normal normal normal 12px/16px Graphik, sans-serif;
176168
padding-top: 0 !important;
177169
}
178170
}
@@ -196,7 +188,7 @@
196188
}
197189

198190
:global(.euiButtonEmpty__content.euiButtonContent .euiButtonEmpty__text) {
199-
font: normal normal normal 13px/18px Graphik;
191+
font: normal normal normal 13px/17px Graphik, sans-serif;
200192
color: var(--buttonSecondaryTextColor) !important;
201193
}
202194

‎redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ const NameSpacesTable = (props: Props) => {
7171
<div className={styles.expanded} key={type.type} data-testid={`expanded-${item.nsp}-${index}`}>
7272
<div className="truncateText">
7373
<EuiToolTip
74+
title="Key Pattern"
7475
anchorClassName={styles.tooltip}
7576
position="bottom"
7677
content={`${item.nsp}:*`}
@@ -83,7 +84,7 @@ const NameSpacesTable = (props: Props) => {
8384
</EuiButtonEmpty>
8485
</EuiToolTip>
8586
</div>
86-
<div><GroupBadge type={type.type} /></div>
87+
<div className={styles.badgesContainer}><GroupBadge type={type.type} /></div>
8788
<div className={styles.rightAlign}>
8889
<span className={styles.count} data-testid="usedMemory-value">
8990
{number}
@@ -123,6 +124,7 @@ const NameSpacesTable = (props: Props) => {
123124
return (
124125
<div className={cx(styles.delimiter, 'truncateText')}>
125126
<EuiToolTip
127+
title="Key Pattern"
126128
anchorClassName={styles.tooltip}
127129
position="bottom"
128130
content={tooltipContent}

‎redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/styles.module.scss‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
}
2121

2222
:global(.euiButton__text) {
23-
font: normal normal normal 13px/18px Graphik !important;
23+
font: normal normal normal 13px/17px Graphik, sans-serif !important;
2424
}
2525

2626
&.activeBtn:global(.euiButton.euiButton-isDisabled.euiButton--fill.euiButton--secondary),
@@ -54,7 +54,7 @@
5454
}
5555

5656
:global(.euiButtonEmpty__content.euiButtonContent .euiButtonEmpty__text) {
57-
font: normal normal normal 13px/18px Graphik;
57+
font: normal normal normal 13px/17px Graphik, sans-serif;
5858
color: var(--buttonSecondaryTextColor) !important;
5959
}
6060

@@ -64,7 +64,7 @@
6464
}
6565

6666
&.expanded {
67-
padding-left: 12px;
67+
padding: 0 20px 0 12px;
6868
}
6969

7070
&.expanded :global(.euiButtonEmpty__content.euiButtonContent .euiButtonEmpty__text) {
@@ -147,7 +147,7 @@
147147
}
148148

149149
.euiTableCellContent__text {
150-
font: normal normal normal 12px/18px Graphik, sans-serif;
150+
font: normal normal normal 12px/17px Graphik, sans-serif;
151151
}
152152
}
153153

@@ -163,7 +163,7 @@
163163

164164
.euiTableCellContent {
165165
padding: 10px;
166-
font: normal normal normal 14px/24px Graphik;
166+
font: normal normal normal 14px/24px Graphik, sans-serif;
167167

168168
&:global(.dataType) {
169169
padding: 10px 6px 2px;
@@ -182,7 +182,7 @@
182182
}
183183

184184
.valueUnit {
185-
font: normal normal normal 12px/18px Graphik, sans-serif !important;
185+
font: normal normal normal 12px/17px Graphik, sans-serif !important;
186186
margin-left: 4px;
187187
color: var(--euiColorMediumShade) !important;
188188
}
@@ -197,7 +197,7 @@
197197

198198
.expanded {
199199
display: grid;
200-
grid-template-columns: auto calc(32%) calc(13% + 6px) calc(11% + 22px);
200+
grid-template-columns: auto calc(32%) calc(13% + 10px) calc(11% + 22px);
201201
grid-column-gap: 0;
202202
height: 42px;
203203
width: 100%;
@@ -228,7 +228,7 @@
228228
:global(.euiTableCellContent) .delimiter span {
229229
cursor: pointer;
230230
color: var(--buttonSecondaryTextColor);
231-
font: normal normal normal 13px/18px Graphik;
231+
font: normal normal normal 13px/17px Graphik, sans-serif;
232232

233233
&:hover {
234234
text-decoration: underline;
@@ -237,7 +237,7 @@
237237

238238
:global(.euiTableCellContent) .count {
239239
color: var(--euiTextSubduedColor);
240-
font: normal normal 500 16px/18px Inconsolata;
240+
font: normal normal 500 16px/17px Inconsolata;
241241
}
242242

243243
.badgesContainer {
@@ -253,7 +253,7 @@
253253
}
254254

255255
:global(.euiBadge) span {
256-
font: normal normal normal 12px/16px Graphik;
256+
font: normal normal normal 12px/16px Graphik, sans-serif;
257257
padding-top: 0 !important;
258258
}
259259
}

0 commit comments

Comments
 (0)