Skip to content

Commit d1b78f1

Browse files
committed
Merge branch '8.1.x' of https://github.com/IgniteUI/igniteui-angular into nrobakova/fix-issue-5949-81
2 parents 97d19af + bad2b8f commit d1b78f1

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid-toolbar/_grid-toolbar-theme.scss

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -168,38 +168,11 @@
168168
height: map-get($grid-toolbar-height, 'comfortable');
169169

170170
%igx-button--flat {
171-
background: --var($theme, 'button-background');
172-
color: --var($theme, 'button-text-color');
173171
margin-left: rem(8);
174-
175-
&:hover {
176-
background: --var($theme, 'button-hover-background');
177-
color: --var($theme, 'button-hover-text-color');
178-
}
179-
180-
&:focus,
181-
&:active {
182-
background: --var($theme, 'button-focus-background');
183-
color: --var($theme, 'button-focus-text-color');
184-
}
185172
}
186173

187174
%igx-button--icon {
188-
background: --var($theme, 'button-background');
189-
color: --var($theme, 'button-text-color');
190175
margin-left: rem(8);
191-
border-radius: 0;
192-
193-
&:hover {
194-
background: --var($theme, 'button-hover-background');
195-
color: --var($theme, 'button-hover-text-color');
196-
}
197-
198-
&:focus,
199-
&:active {
200-
background: --var($theme, 'button-focus-background');
201-
color: --var($theme, 'button-focus-text-color');
202-
}
203176
}
204177

205178
%igx-grid-toolbar__button-space {

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export class IgxGridNavigationService {
2121
}
2222

2323
get displayContainerScrollLeft() {
24-
return Math.round(this.grid.parentVirtDir.getHorizontalScroll().scrollLeft);
24+
return Math.ceil(this.grid.parentVirtDir.getHorizontalScroll().scrollLeft);
2525
}
2626

2727
get verticalDisplayContainerElement() {

0 commit comments

Comments
 (0)