Skip to content

Commit

Permalink
Merge branch 'develop' into dockmanager-unpinned-pane
Browse files Browse the repository at this point in the history
  • Loading branch information
epetrow authored Jan 28, 2025
2 parents 3c865e3 + 746058e commit b68a81f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/core/scss/components/input/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@

// Icon picker
.k-icon-picker {
.k-input-inner {
> .k-input-inner {
padding: $kendo-input-padding-y;
// TODO we need better way
// width: $kendo-input-inner-calc-height;
Expand Down Expand Up @@ -531,7 +531,7 @@
}
}

&.k-icon-picker .k-input-inner {
&.k-icon-picker > .k-input-inner {
width: calc( ( #{ $_line-height} * 1em ) );
height: calc( ( #{ $_line-height} * 1em ) );
padding: $_padding-y;
Expand Down
4 changes: 2 additions & 2 deletions packages/fluent/scss/input/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@

// Icon picker
.k-icon-picker {
.k-input-inner {
> .k-input-inner {
padding: 0;
box-sizing: content-box;
justify-content: center;
Expand Down Expand Up @@ -548,7 +548,7 @@
width: if( $kendo-use-input-spinner-width, var( --kendo-input-spinner-width, #{$_button-width} ), auto );
}

&.k-icon-picker .k-input-inner {
&.k-icon-picker > .k-input-inner {
width: var( --kendo-input-icon-picker-width, #{$_button-width} );
}

Expand Down

0 comments on commit b68a81f

Please sign in to comment.