Skip to content

Commit 36ed9de

Browse files
authored
Merge pull request #3146 from IgniteUI/mpopov/fin_js_styling_refactoring
refactor(lob): improve theming widget integration
2 parents 9cd07a2 + 707c7d1 commit 36ed9de

10 files changed

Lines changed: 758 additions & 694 deletions

File tree

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

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
@import '~igniteui-dockmanager/dist/collection/styles/igc.themes.css';
33

44
:host {
5-
width: 100%;
6-
overflow-y: auto;
5+
width: 100%;
6+
overflow-y: auto;
77
}
88

99

@@ -15,15 +15,15 @@
1515
.dock-m-position {
1616
width: 100vw;
1717
height: 100vh;
18-
padding: 0px 8px 8px 8px;
19-
--igc-pane-content-background: #fff;
18+
padding: 0 rem(8px) rem(8px) rem(8px);
19+
--igc-pane-content-background: #{contrast-color($color: 'gray', $variant: 900)};
2020
}
2121

2222
.chart-types-container {
2323
overflow-y: auto;
2424
height: 100%;
2525
width: 100%;
26-
padding-left: 15px;
26+
padding-left: rem(15px);
2727
}
2828

2929
.selection-area {
@@ -43,18 +43,19 @@
4343

4444

4545
}
46+
4647
$custom-badge-theme: badge-theme(
47-
$border-color: white,
48-
$border-width: 2px,
49-
$icon-color: white,
50-
$text-color: black,
51-
$background-color: black,
48+
$border-color: contrast-color($color: 'gray', $variant: 900),
49+
$border-width: #{rem(2px)},
50+
$icon-color: contrast-color($color: 'gray', $variant: 900),
51+
$text-color: contrast-color($color: 'gray', $variant: 50),
52+
$background-color: contrast-color($color: 'gray', $variant: 500),
5253
$border-radius: 50%
53-
);
54+
);
5455
:host ::ng-deep {
5556
.selected {
56-
igx-badge{
57-
&{
57+
igx-badge {
58+
& {
5859
@include badge($custom-badge-theme);
5960
}
6061

@@ -80,22 +81,29 @@ $custom-badge-theme: badge-theme(
8081

8182
.igx-divider {
8283
margin-top: 5px !important;
83-
background: black !important;
84+
background: contrast-color($color: 'gray', $variant: 50) !important;
8485
width: 95% !important;
8586
}
8687
}
88+
8789
.grid-chart-contextmenu-wrapper {
8890
igx-grid {
8991
@include scrollbar(scrollbar-theme($size: 16px));
9092
}
9193
}
9294

9395
.analytics-btn {
94-
@include button(button-theme(
95-
$foreground: #fff,
96-
$background: #335e3b,
97-
$hover-background: #459a55,
98-
$border-radius: 0));
96+
@include css-vars(
97+
button-theme(
98+
$foreground: contrast-color($color: 'gray', $variant: 900),
99+
$background: color($color: 'success', $variant: 500, $opacity: .8),
100+
$hover-background: color($color: 'success'),
101+
$hover-foreground: contrast-color($color: 'gray', $variant: 900),
102+
$focus-background: color($color: 'success'),
103+
$focus-foreground: contrast-color($color: 'gray', $variant: 900),
104+
$border-radius: 0
105+
)
106+
);
99107
z-index: 9;
100108
position: absolute;
101109
}
@@ -122,7 +130,7 @@ $custom-badge-theme: badge-theme(
122130
pointer-events: none;
123131
}
124132

125-
.disabled{
133+
.disabled {
126134
opacity: .5;
127135
}
128136

@@ -132,33 +140,35 @@ $custom-badge-theme: badge-theme(
132140
pointer-events: none;
133141
}
134142

135-
$font-family: "Titillium Web", "Roboto", "Helvetica Neue", sans-serif;
136-
.tab-options-wrapper{
143+
$font-family: 'Titillium Web', 'Roboto', 'Helvetica Neue', sans-serif;
144+
145+
.tab-options-wrapper {
137146
@include scrollbar(scrollbar-theme($size: 6px));
138147

139148
display: flex;
140149
flex-flow: column;
141-
max-height: 110px;
142-
max-width: 310px;
150+
max-height: rem(110px);
151+
max-width: rem(310px);
143152
margin: -0.8rem -1.5rem -0.8rem -1.5rem;
144-
.header{
153+
154+
.header {
145155
font-size: 0.7rem;
146156
display: flex;
147157
width: 100%;
148158
padding: 0 0.2rem 0 0.4rem;
149159
font-weight: 650;
150-
border-bottom: 1px solid #BDBDBD;
160+
border-bottom: 1px solid color($color: 'gray', $variant: 100);
151161
align-self: center;
152162
font-family: $font-family;
153163
letter-spacing: 1.7px;
154-
color: rgba(0, 0, 0, 0.87);
164+
color: contrast-color($color: 'gray', $variant: 50);
155165
}
156166
}
157167

158168
.tab-option {
159169
padding: .5rem 0.4rem 0.4rem 0.4rem;
160-
height: 110px;
161-
width: 310px;
170+
height: rem(110px);
171+
width: rem(310px);
162172
display: inline-flex;
163173
overflow-x: auto;
164174
overflow-y: hidden;
@@ -170,7 +180,8 @@ $font-family: "Titillium Web", "Roboto", "Helvetica Neue", sans-serif;
170180
cursor: pointer;
171181

172182
opacity: .62;
173-
&.selected--condition{
183+
184+
&.selected--condition {
174185
pointer-events: none;
175186
opacity: 1;
176187
}
@@ -183,7 +194,7 @@ $font-family: "Titillium Web", "Roboto", "Helvetica Neue", sans-serif;
183194
}
184195
}
185196

186-
.clear-action{
197+
.clear-action {
187198
cursor: pointer;
188199
display: flex;
189200
flex-flow: column;
@@ -202,7 +213,7 @@ $font-family: "Titillium Web", "Roboto", "Helvetica Neue", sans-serif;
202213
flex-flow: column;
203214
align-items: center;
204215

205-
img{
216+
img {
206217
pointer-events: none;
207218
}
208219

0 commit comments

Comments
 (0)