Skip to content

Commit 367f83e

Browse files
authored
Merge branch 'master' into mkirova/fix-8076
2 parents b820a08 + 4c2851b commit 367f83e

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,7 @@
605605
}
606606

607607
%cal-value,
608-
%cal-value--label,
609-
{
608+
%cal-value--label {
610609
// 100 divided by the number of weekdays
611610
min-width: 14.28%;
612611

@@ -683,11 +682,7 @@
683682

684683
&::after {
685684
top: 100%;
686-
@if $not-bootstrap-theme{
687-
height: ($cal-row-padding / 2) + rem(2px);
688-
} @else {
689-
height: $cal-row-padding + rem(5px);
690-
}
685+
height: if($not-bootstrap-theme, ($cal-row-padding / 2) + rem(2px), $cal-row-padding + rem(5px));
691686
}
692687

693688
&::before {
@@ -718,7 +713,7 @@
718713
}
719714

720715
&:nth-child(2) {
721-
@if $not-bootstrap-theme{
716+
@if $not-bootstrap-theme {
722717
margin-top: 0;
723718
}
724719
}
@@ -733,7 +728,7 @@
733728
}
734729
}
735730

736-
@if $bootstrap-theme{
731+
@if $bootstrap-theme {
737732
margin-bottom: 0;
738733
}
739734
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
igx-display-container {
3131
@extend %grid-display-container-thead !optional;
3232
}
33+
34+
&:focus {
35+
@extend %disable-focus-styles !optional;
36+
}
3337
}
3438

3539
@include e(thead-title) {
@@ -64,6 +68,10 @@
6468

6569
@include e(tbody-content) {
6670
@extend %grid-tbody !optional;
71+
72+
&:focus {
73+
@extend %disable-focus-styles !optional;
74+
}
6775
}
6876

6977
@include e(tbody-message) {
@@ -104,6 +112,10 @@
104112

105113
@include e(tfoot) {
106114
@extend %grid-tfoot !optional;
115+
116+
&:focus {
117+
@extend %disable-focus-styles !optional;
118+
}
107119
}
108120

109121
@include e(tfoot-thumb) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,10 @@
696696
indigo-design: 600,
697697
), $variant);
698698

699+
%disable-focus-styles {
700+
outline: 0;
701+
}
702+
699703
%grid-display {
700704
position: relative;
701705
display: grid;

0 commit comments

Comments
 (0)