Skip to content

Commit 165ec66

Browse files
inikolovainikolova
committed
fix: importing theme in a class creates a wrong selector
1 parent a3670ac commit 165ec66

File tree

48 files changed

+426
-449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+426
-449
lines changed

‎packages/bootstrap/scss/menu/_layout.scss

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
padding-inline: 0;
1414
}
1515

16-
.k-menu-group,
17-
.k-menu-vertical {
18-
19-
.k-menu-popup & {
20-
padding: 0;
21-
}
16+
.k-menu-popup :is(.k-menu-group, .k-menu-vertical) {
17+
padding: 0;
2218
}
2319

2420
.k-context-menu-popup {

‎packages/bootstrap/scss/scheduler/_layout.scss

+8-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
&::before {
1212
display: none;
1313
left: 0;
14-
15-
.k-rtl & {
16-
right: 0;
17-
}
1814
}
1915

2016
// Angular fix for stronger selector and smaller padding
@@ -35,4 +31,12 @@
3531
}
3632
}
3733

34+
.k-rtl {
35+
kendo-scheduler .k-event,
36+
.k-event {
37+
&::before {
38+
right: 0;
39+
}
40+
}
41+
}
3842
}

‎packages/default/scss/adaptive/_layout.scss

+11-16
Original file line numberDiff line numberDiff line change
@@ -454,28 +454,23 @@
454454
}
455455

456456
}
457+
}
457458

458-
// RTL
459-
.k-rtl &,
460-
&[dir="rtl"],
461-
[dir="rtl"] & {
462-
463-
.k-scheduler-mobile {
464-
465-
.k-scheduler-toolbar {
466-
> ul > li {
467-
border: 0;
468-
}
459+
// RTL
460+
:is(.k-rtl .k-pane-wrapper, [dir="rtl"] .k-pane-wrapper, .k-pane-wrapper[dir="rtl"]) {
461+
.k-scheduler-mobile {
462+
.k-scheduler-toolbar {
463+
> ul > li {
464+
border: 0;
469465
}
466+
}
470467

471-
.k-task .k-i-reload {
472-
margin-left: .5em;
473-
margin-right: 0;
474-
}
468+
.k-task .k-i-reload {
469+
margin-left: .5em;
470+
margin-right: 0;
475471
}
476472
}
477473
}
478-
479474
}
480475

481476

‎packages/default/scss/calendar/_theme.scss

+6-8
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,6 @@
123123
);
124124
}
125125

126-
127-
&[dir="rtl"],
128-
.k-rtl & {
129-
.k-calendar-navigation {
130-
box-shadow: inset 1px 0 $kendo-calendar-navigation-border;
131-
}
132-
}
133-
134126
// Invalid
135127
&.k-invalid,
136128
&.k-invalid:hover,
@@ -140,6 +132,12 @@
140132
}
141133
}
142134

135+
.k-rtl .k-calendar,
136+
.k-calendar[dir="rtl"] {
137+
.k-calendar-navigation {
138+
box-shadow: inset 1px 0 $kendo-calendar-navigation-border;
139+
}
140+
}
143141

144142
// Scheduler integration
145143
.k-scheduler .k-calendar .k-other-month {

‎packages/default/scss/card/_layout.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@
116116
max-width: 100%;
117117
flex-shrink: 0;
118118
overflow: hidden;
119+
}
119120

120-
.k-card-horizontal & {
121-
max-width: $kendo-card-img-max-width;
122-
object-fit: cover;
123-
}
121+
.k-card-horizontal .k-card-media {
122+
max-width: $kendo-card-img-max-width;
123+
object-fit: cover;
124124
}
125125

126126

‎packages/default/scss/chat/_layout.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -300,17 +300,19 @@
300300
fill: currentColor;
301301
display: inline-block;
302302
}
303+
}
304+
}
303305

304-
.k-rtl &,
305-
[dir="rtl"] & {
306+
.k-rtl,
307+
[dir="rtl"] {
308+
.k-message-box {
309+
.k-button {
306310
transform: scaleX(-1);
307311
}
308312
}
309313
}
310314

311315

312-
313-
314316
// Card list
315317
.k-chat .k-card-list {
316318
margin: $kendo-chat-bubble-spacing 0 0;

‎packages/default/scss/datetimepicker/_layout.scss

+3-7
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,9 @@
4141
transform: translateX(-100%);
4242
}
4343

44-
.k-time-tab .k-datetime-selector {
45-
&.k-rtl,
46-
&[dir="rtl"],
47-
.k-rtl &,
48-
[dir="rtl"] & {
49-
transform: translateX(100%);
50-
}
44+
:is(.k-rtl, [dir="rtl"]) .k-time-tab .k-datetime-selector,
45+
.k-time-tab .k-datetime-selector:is(.k-rtl, [dir="rtl"]) {
46+
transform: translateX(100%);
5147
}
5248
}
5349

‎packages/default/scss/expansion-panel/_layout.scss

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
*::after {
2121
box-sizing: border-box;
2222
}
23+
}
2324

24-
.k-rtl &,
25-
&.k-rtl,
26-
&[dir = "rtl"] {
27-
// Expand / collapse icon
28-
.k-expander-indicator {
29-
margin-left: 0;
30-
margin-right: $kendo-expander-indicator-margin-x;
31-
}
25+
.k-rtl .k-expander,
26+
.k-expander.k-rtl,
27+
.k-expander[dir="rtl"] {
28+
// Expand / collapse icon
29+
.k-expander-indicator {
30+
margin-left: 0;
31+
margin-right: $kendo-expander-indicator-margin-x;
3232
}
3333
}
3434

‎packages/default/scss/fab/_layout.scss

+5-6
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,13 @@
3939
padding-inline: $kendo-fab-icon-padding-x;
4040
padding-block: $kendo-fab-icon-padding-y;
4141
box-sizing: content-box;
42-
43-
.k-icon-wrapper-host:not(:only-child) &,
44-
&:not(:only-child) {
45-
margin-inline-end: $kendo-fab-icon-spacing;
46-
margin-inline-start: calc( #{$kendo-fab-icon-spacing} * -1 );
47-
}
4842
}
4943

44+
.k-icon-wrapper-host:not(:only-child) .k-fab-icon,
45+
.k-fab-icon:not(:only-child) {
46+
margin-inline-end: $kendo-fab-icon-spacing;
47+
margin-inline-start: calc( #{$kendo-fab-icon-spacing} * -1 );
48+
}
5049

5150
// Sizes
5251
@each $size, $size-props in $kendo-fab-sizes {

‎packages/default/scss/floating-label/_layout.scss

+20-21
Original file line numberDiff line numberDiff line change
@@ -57,33 +57,32 @@
5757
&.k-empty:not(.k-focus):not(:focus-within) ::placeholder {
5858
color: transparent;
5959
}
60+
}
6061

61-
[dir="rtl"] &,
62-
.k-rtl &,
63-
&[dir="rtl"] {
62+
[dir="rtl"] .k-floating-label-container,
63+
.k-rtl .k-floating-label-container,
64+
.k-floating-label-container[dir="rtl"] {
65+
> .k-floating-label {
66+
transform-origin: right center;
67+
transition: transform $kendo-floating-label-transition, color $kendo-floating-label-transition, top $kendo-floating-label-transition, right $kendo-floating-label-transition;
68+
}
6469

70+
&.k-empty {
6571
> .k-floating-label {
66-
transform-origin: right center;
67-
transition: transform $kendo-floating-label-transition, color $kendo-floating-label-transition, top $kendo-floating-label-transition, right $kendo-floating-label-transition;
68-
}
69-
70-
&.k-empty {
71-
> .k-floating-label {
72-
left: auto;
73-
right: var(--kendo-floating-label-offset-x, #{$kendo-floating-label-offset-x});
74-
}
75-
}
76-
77-
> .k-floating-label,
78-
&.k-focus > .k-floating-label {
7972
left: auto;
80-
right: var(--kendo-floating-label-focus-offset-x, #{$kendo-floating-label-focus-offset-x});
81-
}
82-
&:focus-within > .k-floating-label {
83-
left: auto;
84-
right: var(--kendo-floating-label-focus-offset-x, #{$kendo-floating-label-focus-offset-x});
73+
right: var(--kendo-floating-label-offset-x, #{$kendo-floating-label-offset-x});
8574
}
8675
}
76+
77+
> .k-floating-label,
78+
&.k-focus > .k-floating-label {
79+
left: auto;
80+
right: var(--kendo-floating-label-focus-offset-x, #{$kendo-floating-label-focus-offset-x});
81+
}
82+
&:focus-within > .k-floating-label {
83+
left: auto;
84+
right: var(--kendo-floating-label-focus-offset-x, #{$kendo-floating-label-focus-offset-x});
85+
}
8786
}
8887

8988
}

‎packages/default/scss/forms/_layout.scss

+14-18
Original file line numberDiff line numberDiff line change
@@ -197,27 +197,23 @@
197197
}
198198

199199
// RTL Adjustments
200-
.k-form {
201-
[dir="rtl"],
202-
.k-rtl & {
203-
.k-label-optional {
204-
margin-left: 0;
205-
margin-right: $kendo-label-optional-margin-x;
206-
}
200+
.k-form [dir="rtl"],
201+
.k-rtl .k-form {
202+
.k-label-optional {
203+
margin-left: 0;
204+
margin-right: $kendo-label-optional-margin-x;
207205
}
208206
}
209207

210-
.k-form-horizontal {
211-
[dir="rtl"],
212-
.k-rtl & {
213-
&.k-form-field,
214-
.k-form-field {
215-
> .k-label,
216-
> kendo-label,
217-
> .k-form-label {
218-
margin-right: 0;
219-
margin-left: $kendo-horizontal-form-label-margin-x;
220-
}
208+
.k-form-horizontal [dir="rtl"],
209+
.k-rtl .k-form-horizontal {
210+
&.k-form-field,
211+
.k-form-field {
212+
> .k-label,
213+
> kendo-label,
214+
> .k-form-label {
215+
margin-right: 0;
216+
margin-left: $kendo-horizontal-form-label-margin-x;
221217
}
222218
}
223219
}

‎packages/default/scss/input/_layout.scss

+11-12
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@
6565
&:disabled,
6666
&[disabled] {
6767
@include disabled( $kendo-disabled-styling... );
68-
69-
[disabled] &,
70-
.k-disabled & {
71-
opacity: 1;
72-
filter: grayscale(0);
73-
}
7468
}
7569
}
70+
71+
:is([disabled], .k-disabled) :is(input.k-input, textarea.k-textarea):is(:disabled, [disabled]) {
72+
opacity: 1;
73+
filter: grayscale(0);
74+
}
75+
7676
textarea.k-textarea {
7777
overflow: auto;
7878
}
@@ -90,15 +90,14 @@
9090
&:disabled,
9191
&[disabled] {
9292
@include disabled( $kendo-disabled-styling... );
93-
94-
[disabled] &,
95-
.k-disabled & {
96-
opacity: 1;
97-
filter: grayscale(0);
98-
}
9993
}
10094
}
10195

96+
:is([disabled], .k-disabled) select.k-picker:is(:disabled, [disabled]) {
97+
opacity: 1;
98+
filter: grayscale(0);
99+
}
100+
102101

103102
// Input inner
104103
.k-input-inner {

‎packages/default/scss/map/_layout.scss

+7-4
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@
7575
border-radius: 50%;
7676
position: relative;
7777

78-
.k-pdf-export & { display: none; }
79-
8078

8179
// Buttons
8280
.k-button {
@@ -125,10 +123,15 @@
125123
border: 0;
126124
background: none;
127125
display: flex;
128-
129-
.k-pdf-export & { display: none; }
130126
}
131127

128+
129+
.k-pdf-export {
130+
.k-navigator,
131+
.k-zoom-control {
132+
display: none;
133+
}
134+
}
132135
}
133136

134137

‎packages/default/scss/pager/_layout.scss

+6-2
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,13 @@
8888
@if ($kendo-pager-item-spacing) {
8989
margin-left: $kendo-pager-item-spacing;
9090
}
91+
}
9192

92-
.k-rtl &,
93-
[dir="rtl"] & {
93+
.k-rtl,
94+
[dir="rtl"] {
95+
.k-pager-nav + .k-pager-nav,
96+
.k-pager-nav + .k-pager-numbers-wrap,
97+
.k-pager-numbers-wrap + .k-pager-nav {
9498
@if ($kendo-pager-item-spacing) {
9599
margin-left: 0;
96100
margin-right: $kendo-pager-item-spacing;

0 commit comments

Comments
 (0)