Skip to content

Commit 0396da8

Browse files
Merge pull request #3312 from RedisInsight/fe/feature/fix_scrolls
#RI-5667 - No scrollbar when editing long value
2 parents 9eb2c40 + f1f28b5 commit 0396da8

File tree

8 files changed

+41
-8
lines changed

8 files changed

+41
-8
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ jobs:
654654
macosx:
655655
macos:
656656
xcode: 14.2.0
657-
resource_class: macos.m1.medium.gen1
657+
resource_class: macos.x86.medium.gen2
658658
parameters:
659659
env:
660660
description: Build environment (stage || prod)

redisinsight/ui/src/styles/base/_base.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ html {
88
// sass-lint:disable-block no-misspelled-properties
99
scrollbar-width: thin;
1010

11-
scrollbar-color: transparent(var(--euiColorDarkShade), 0.5) transparent; // Firefox support
11+
scrollbar-color: var(--scrollBackgroundColor) transparent;
1212
}
1313

1414
body {

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,42 @@
22
box-shadow: 0 3px 15px var(--controlsBoxShadowColor) !important;
33
}
44

5+
.euiPopover__panel .euiPopover__panelArrow.euiPopover__panelArrow {
6+
border-color: transparent !important;
7+
8+
&--left:before {
9+
border-left-color: var(--euiColorLightShade) !important;
10+
}
11+
&--left:after {
12+
border-left-color: var(--euiColorEmptyShade) !important;
13+
}
14+
15+
&--right:before {
16+
border-right-color: var(--euiColorLightShade) !important;
17+
}
18+
&--right:after {
19+
border-right-color: var(--euiColorEmptyShade) !important;
20+
}
21+
22+
&--bottom:before {
23+
border-bottom-color: var(--euiColorLightShade) !important;
24+
}
25+
&--bottom:after {
26+
border-bottom-color: var(--euiColorEmptyShade) !important;
27+
}
28+
29+
&--top:before {
30+
border-top-color: var(--euiColorLightShade) !important;
31+
}
32+
&--top:after {
33+
border-top-color: var(--euiColorEmptyShade) !important;
34+
}
35+
}
36+
537
.popoverLikeTooltip {
638
border: none;
739
max-width: 267px !important;
840
background-color: var(--euiTooltipBackgroundColor) !important;
9-
1041
.euiPopover__panelArrow.euiPopover__panelArrow--bottom:after {
1142
border-bottom-color: var(--euiTooltipBackgroundColor) !important;
1243
}

redisinsight/ui/src/styles/mixins/_eui.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
$trackBackgroundColor: transparent;
2-
31
$euiBreakpoints: (
42
"xs": 0,
53
"s": 575px,
@@ -23,14 +21,14 @@ $euiBreakpointKeys: map-keys($euiBreakpoints);
2321
}
2422

2523
&::-webkit-scrollbar-thumb {
26-
background-color: transparent(var(--euiColorDarkShade), .5);
27-
border: 16px Corner solid $trackBackgroundColor;
24+
background-color: var(--scrollBackgroundColor);
25+
border: 6px solid transparent;
2826
background-clip: content-box;
2927
}
3028

3129
&::-webkit-scrollbar-corner,
3230
&::-webkit-scrollbar-track {
33-
background-color: $trackBackgroundColor;
31+
background-color: transparent;
3432
}
3533

3634
@content;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ $externalLinkTooltipColor: $externalLinkColor;
7373
$linkToastColor: $externalLinkColor;
7474
$defaultGreenColor: #608b4e;
7575
$insightsTriggerBgColor: #292f47;
76+
$scrollBackgroundColor: rgba(105, 112, 125, 0.5);
7677

7778
$tableRowHoverColor: #070707;
7879
$tableRowSelectedColor: #212536;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
--euiTextSubduedColorHover: #{$euiTextSubduedColorHover};
4343
--euiTitleColor: #{$euiTitleColor};
4444
--euiBreadcrumbActive: #{$euiBreadcrumbActive};
45+
--scrollBackgroundColor: #{$scrollBackgroundColor};
4546

4647
// Contrasty text variants
4748
--euiColorPrimaryText: #{$euiColorPrimaryText};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ $externalLinkTooltipColor: #3163d8;
3737
$linkToastColor: #adbeff;
3838
$defaultGreenColor: #008000;
3939
$insightsTriggerBgColor: #D7E3FA;
40+
$scrollBackgroundColor: rgba(105, 112, 125, 0.5);
4041

4142
$tableRowHoverColor: #fafbfd;
4243
$tableRowSelectedColor: #ebeffa;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
--euiTextSubduedColorHover: #{$euiTextSubduedColorHover};
3939
// --euiTitleColor: #{$euiTitleColor};
4040
--euiBreadcrumbActive: #{$euiBreadcrumbActive};
41+
--scrollBackgroundColor: #{$scrollBackgroundColor};
4142

4243
// Contrasty text variants
4344
--euiColorPrimaryText: #{$euiColorPrimaryText};

0 commit comments

Comments
 (0)