Skip to content

Commit 48cff57

Browse files
authored
Merge pull request #2981 from IgniteUI/dTsvetkov/add-data-analysis-scrollbar-theme-master
Add scrollbar theme in data analysis samples
2 parents ce0768d + 7ff209d commit 48cff57

2 files changed

Lines changed: 7 additions & 35 deletions

File tree

projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.scss

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
overflow-y: auto;
77
}
88

9-
@mixin scrollbar($scrollbar-width, $scrollbar-height) {
10-
$scrollbar-track: hexrgba(color($color: 'grays', $variant: 200));
11-
$scrollbar-thumb: hexrgba(color($color: 'grays', $variant: 400));
12-
13-
::-webkit-scrollbar {
14-
width: $scrollbar-width;
15-
height: $scrollbar-height;
16-
background-color: $scrollbar-track;
17-
}
18-
19-
::-webkit-scrollbar-thumb {
20-
background-color: $scrollbar-thumb;
21-
}
22-
}
239

2410
.grid-chart-contextmenu-wrapper {
2511
width: 100%;
@@ -42,7 +28,7 @@
4228

4329
.selection-area {
4430

45-
@include scrollbar(6px, 6px);
31+
@include scrollbar(scrollbar-theme($size: 6px));
4632
width: 100%;
4733
height: 90%;
4834
display: inline-flex;
@@ -100,7 +86,7 @@ $custom-badge-theme: badge-theme(
10086
}
10187
.grid-chart-contextmenu-wrapper {
10288
igx-grid {
103-
@include scrollbar(16px, 16px);
89+
@include scrollbar(scrollbar-theme($size: 16px));
10490
}
10591
}
10692

@@ -127,7 +113,7 @@ $custom-badge-theme: badge-theme(
127113
}
128114

129115
igx-tab-content {
130-
@include scrollbar(10px, 10px);
116+
@include scrollbar(scrollbar-theme($size: 10px));
131117
}
132118

133119
}
@@ -148,7 +134,7 @@ $custom-badge-theme: badge-theme(
148134

149135
$font-family: "Titillium Web", "Roboto", "Helvetica Neue", sans-serif;
150136
.tab-options-wrapper{
151-
@include scrollbar(6px, 6px);
137+
@include scrollbar(scrollbar-theme($size: 6px));
152138

153139
display: flex;
154140
flex-flow: column;

projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.scss

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,6 @@
44
// width: 100%;
55
// }
66

7-
@mixin scrollbar($scrollbar-width, $scrollbar-height) {
8-
$scrollbar-track: hexrgba(color($color: 'grays', $variant: 200));
9-
$scrollbar-thumb: hexrgba(color($color: 'grays', $variant: 400));
10-
11-
::-webkit-scrollbar {
12-
width: $scrollbar-width;
13-
height: $scrollbar-height;
14-
background-color: $scrollbar-track;
15-
}
16-
17-
::-webkit-scrollbar-thumb {
18-
background-color: $scrollbar-thumb;
19-
}
20-
}
217

228
.grid-chart-contextmenu-wrapper {
239
width: 90%;
@@ -28,7 +14,7 @@
2814
:host ::ng-deep {
2915
.grid-chart-contextmenu-wrapper {
3016
igx-grid {
31-
@include scrollbar(16px, 16px);
17+
@include scrollbar(scrollbar-theme($size: 16px));
3218
}
3319
}
3420

@@ -74,7 +60,7 @@
7460

7561
.selection-area {
7662

77-
@include scrollbar(6px, 6px);
63+
@include scrollbar(scrollbar-theme($size: 6px));
7864
width: 100%;
7965
height: 95%;
8066
position: absolute;
@@ -129,7 +115,7 @@
129115
}
130116

131117
igx-tab-content {
132-
@include scrollbar(10px, 10px);
118+
@include scrollbar(scrollbar-theme($size: 10px));
133119
}
134120

135121
}

0 commit comments

Comments
 (0)