Skip to content

Fe/bugfix/ri 3621 table styles #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 14, 2022
Merged

Fe/bugfix/ri 3621 table styles #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ee706
#RI-3649-add tooltip title
AmirAllayarovSofteq Oct 12, 2022
7a0c39d
#RI-3621-update table styles
AmirAllayarovSofteq Oct 13, 2022
2a9aa49
#RI-3621-add sun-serif
AmirAllayarovSofteq Oct 13, 2022
b3b6086
#RI-3621-add sun-serif
AmirAllayarovSofteq Oct 13, 2022
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
2 changes: 1 addition & 1 deletion ...nsight/ui/src/pages/databaseAnalysis/components/empty-analysis-message/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
margin: auto;

.title {
font: normal normal 500 18px/24px Graphik !important;
font: normal normal 500 18px/24px Graphik, sans-serif !important;
padding-bottom: 12px;
}

Expand Down
2 changes: 1 addition & 1 deletion redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const Table = (props: Props) => {
width: '10%',
align: 'left',
sortable: true,
className: 'dataType',
render: (type: string) => (
<div className={styles.badgesContainer}>
<GroupBadge key={type} type={type} className={styles.badge} />
Expand All @@ -99,6 +98,7 @@ const Table = (props: Props) => {
return (
<div data-testid="top-keys-table-name" className={cx(styles.delimiter, 'truncateText')}>
<EuiToolTip
title="Key Name"
anchorClassName={styles.tooltip}
position="bottom"
content={tooltipContent}
Expand Down
24 changes: 8 additions & 16 deletions redisinsight/ui/src/pages/databaseAnalysis/components/top-keys/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
}

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

&.activeBtn:global(.euiButton.euiButton-isDisabled.euiButton--fill.euiButton--secondary),
Expand Down Expand Up @@ -99,7 +99,7 @@
}

.euiTableCellContent__text {
font: normal normal normal 12px/18px Graphik, sans-serif;
font: normal normal normal 12px/17px Graphik, sans-serif;
}
}

Expand All @@ -111,11 +111,7 @@

.euiTableRowCell .euiTableCellContent {
padding: 10px;
font: normal normal normal 14px/24px Graphik;

&:global(.dataType) {
padding: 10px 6px 2px;
}
font: normal normal normal 14px/17px Graphik, sans-serif;
}

.euiTableHeaderButton.euiTableHeaderButton-isSorted {
Expand All @@ -130,7 +126,7 @@
}

.valueUnit {
font: normal normal normal 12px/18px Graphik, sans-serif !important;
font: normal normal normal 12px/17px Graphik, sans-serif !important;
margin-left: 4px;
color: var(--euiColorMediumShade) !important;
}
Expand All @@ -151,7 +147,7 @@
:global(.euiTableCellContent) .delimiter span {
cursor: pointer;
color: var(--buttonSecondaryTextColor);
font: normal normal normal 13px/18px Graphik;
font: normal normal normal 13px/17px Graphik, sans-serif;

&:hover {
text-decoration: underline;
Expand All @@ -160,19 +156,15 @@

:global(.euiTableCellContent) .count {
color: var(--euiTextSubduedColor);
font: normal normal 500 16px/18px Inconsolata;
font: normal normal 500 16px/17px Inconsolata;
}

.badgesContainer {
display: flex;
flex-wrap: wrap;

& .badge {
margin: 0 7px 8px;
}

:global(.euiBadge) span {
font: normal normal normal 12px/16px Graphik;
font: normal normal normal 12px/16px Graphik, sans-serif;
padding-top: 0 !important;
}
}
Expand All @@ -196,7 +188,7 @@
}

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

Expand Down
4 changes: 3 additions & 1 deletion redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const NameSpacesTable = (props: Props) => {
<div className={styles.expanded} key={type.type} data-testid={`expanded-${item.nsp}-${index}`}>
<div className="truncateText">
<EuiToolTip
title="Key Pattern"
anchorClassName={styles.tooltip}
position="bottom"
content={`${item.nsp}:*`}
Expand All @@ -83,7 +84,7 @@ const NameSpacesTable = (props: Props) => {
</EuiButtonEmpty>
</EuiToolTip>
</div>
<div><GroupBadge type={type.type} /></div>
<div className={styles.badgesContainer}><GroupBadge type={type.type} /></div>
<div className={styles.rightAlign}>
<span className={styles.count} data-testid="usedMemory-value">
{number}
Expand Down Expand Up @@ -123,6 +124,7 @@ const NameSpacesTable = (props: Props) => {
return (
<div className={cx(styles.delimiter, 'truncateText')}>
<EuiToolTip
title="Key Pattern"
anchorClassName={styles.tooltip}
position="bottom"
content={tooltipContent}
Expand Down
20 changes: 10 additions & 10 deletions redisinsight/ui/src/pages/databaseAnalysis/components/top-namespace/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}

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

&.activeBtn:global(.euiButton.euiButton-isDisabled.euiButton--fill.euiButton--secondary),
Expand Down Expand Up @@ -54,7 +54,7 @@
}

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

Expand All @@ -64,7 +64,7 @@
}

&.expanded {
padding-left: 12px;
padding: 0 20px 0 12px;
}

&.expanded :global(.euiButtonEmpty__content.euiButtonContent .euiButtonEmpty__text) {
Expand Down Expand Up @@ -147,7 +147,7 @@
}

.euiTableCellContent__text {
font: normal normal normal 12px/18px Graphik, sans-serif;
font: normal normal normal 12px/17px Graphik, sans-serif;
}
}

Expand All @@ -163,7 +163,7 @@

.euiTableCellContent {
padding: 10px;
font: normal normal normal 14px/24px Graphik;
font: normal normal normal 14px/24px Graphik, sans-serif;

&:global(.dataType) {
padding: 10px 6px 2px;
Expand All @@ -182,7 +182,7 @@
}

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

.expanded {
display: grid;
grid-template-columns: auto calc(32%) calc(13% + 6px) calc(11% + 22px);
grid-template-columns: auto calc(32%) calc(13% + 10px) calc(11% + 22px);
grid-column-gap: 0;
height: 42px;
width: 100%;
Expand Down Expand Up @@ -228,7 +228,7 @@
:global(.euiTableCellContent) .delimiter span {
cursor: pointer;
color: var(--buttonSecondaryTextColor);
font: normal normal normal 13px/18px Graphik;
font: normal normal normal 13px/17px Graphik, sans-serif;

&:hover {
text-decoration: underline;
Expand All @@ -237,7 +237,7 @@

:global(.euiTableCellContent) .count {
color: var(--euiTextSubduedColor);
font: normal normal 500 16px/18px Inconsolata;
font: normal normal 500 16px/17px Inconsolata;
}

.badgesContainer {
Expand All @@ -253,7 +253,7 @@
}

:global(.euiBadge) span {
font: normal normal normal 12px/16px Graphik;
font: normal normal normal 12px/16px Graphik, sans-serif;
padding-top: 0 !important;
}
}
Expand Down