Skip to content
This repository was archived by the owner on Jun 1, 2025. It is now read-only.

Commit 46da5c2

Browse files
Ghislain BeaulacGhislain Beaulac
authored andcommitted
feat(grouping): move the Grouping icons into slick-bootstrap.scss which is the correct place
1 parent c6223ba commit 46da5c2

File tree

2 files changed

+33
-19
lines changed

2 files changed

+33
-19
lines changed

src/app/modules/angular-slickgrid/styles/slick-bootstrap.scss

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
&.selected {
7070
background-color: inherit !important;
7171
}
72+
7273
}
7374
&.odd {
7475
background: $row-highlight-background-color;
@@ -150,6 +151,26 @@
150151
height: 100%;
151152
padding: 0;
152153
}
154+
.slick-group-toggle {
155+
width: 9px;
156+
height: 9px;
157+
margin-right: $icon-group-margin-right;
158+
color: $icon-group-color;
159+
cursor: pointer;
160+
font-weight: $icon-group-font-weight;
161+
162+
&.expanded:before {
163+
content: $icon-group-expanded;
164+
font-family: $icon-font-family;
165+
font-size: $icon-group-font-size;
166+
}
167+
168+
&.collapsed:before {
169+
content: $icon-group-collapsed;
170+
font-family: $icon-font-family;
171+
font-size: $icon-group-font-size;
172+
}
173+
}
153174
}
154175
}
155176

src/app/modules/angular-slickgrid/styles/slick-default-theme.scss

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -133,25 +133,18 @@
133133
}
134134

135135
.slick-group-toggle {
136-
width: 9px;
137-
height: 9px;
138-
margin-right: $icon-group-margin-right;
139-
color: $icon-group-color;
140-
cursor: pointer;
141-
font-weight: $icon-group-font-weight;
142-
143-
&.expanded:before {
144-
content: $icon-group-expanded;
145-
font-family: $icon-font-family;
146-
font-size: $icon-group-font-size;
147-
}
148-
149-
&.collapsed:before {
150-
content: $icon-group-collapsed;
151-
font-family: $icon-font-family;
152-
font-size: $icon-group-font-size;
153-
}
154-
}
136+
width: 9px;
137+
height: 9px;
138+
margin-right: 5px;
139+
}
140+
141+
.slick-group-toggle.expanded {
142+
background: none;
143+
}
144+
145+
.slick-group-toggle.collapsed {
146+
background: none;
147+
}
155148

156149
.slick-group-totals {
157150
color: gray;

0 commit comments

Comments
 (0)