Skip to content

Commit

Permalink
chore: fix broken builds
Browse files Browse the repository at this point in the history
  • Loading branch information
inikolova committed Oct 17, 2024
1 parent b02be90 commit ddd630f
Show file tree
Hide file tree
Showing 13 changed files with 84 additions and 77 deletions.
6 changes: 3 additions & 3 deletions packages/bootstrap/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ $kendo-transition: color .2s ease-in-out, background-color .2s ease-in-out, bord
// TODO: refactor once we extract drag drop as separate module


@forward "@progress/kendo-theme-default/scss/scss/_variables.scss" with (
$kendo-enable-shadows: $kendo-enable-shadows,
/* @forward "@progress/kendo-theme-default/scss/scss/_variables.scss" with (
// $kendo-enable-shadows: $kendo-enable-shadows,
$kendo-enable-gradients: $kendo-enable-gradients,
$kendo-enable-transitions: $kendo-enable-transitions,
$kendo-enable-focus-contrast: $kendo-enable-focus-contrast,
Expand All @@ -53,4 +53,4 @@ $kendo-transition: color .2s ease-in-out, background-color .2s ease-in-out, bord
$kendo-zindex-window: $kendo-zindex-window,
$kendo-focus-shadow: $kendo-focus-shadow,
$kendo-transition: $kendo-transition
);
); */
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/colorgradient/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ $kendo-color-gradient-draghandle-bg: transparent !default;
$kendo-color-gradient-draghandle-border: rgba( $kendo-color-white, .8) !default;
/// The color of the outline around the ColorGradient canvas drag handle.
/// @group color-gradient
$kendo-color-gradient-draghandle-shadow: rgba( $kendo-color-black, .5) !default;
// $kendo-color-gradient-draghandle-shadow: rgba( $kendo-color-black, .5) !default;
/// The focus color of the outline around the ColorGradient canvas drag handle.
/// @group color-gradient
$kendo-color-gradient-draghandle-focus-shadow: $kendo-color-black !default;
Expand Down Expand Up @@ -179,7 +179,7 @@ $kendo-color-gradient-contrast-spacer: calc( #{$kendo-color-gradient-spacer} / 2
$kendo-color-gradient-draghandle-text: $kendo-color-gradient-draghandle-text,
$kendo-color-gradient-draghandle-bg: $kendo-color-gradient-draghandle-bg,
$kendo-color-gradient-draghandle-border: $kendo-color-gradient-draghandle-border,
$kendo-color-gradient-draghandle-shadow: $kendo-color-gradient-draghandle-shadow,
// $kendo-color-gradient-draghandle-shadow: $kendo-color-gradient-draghandle-shadow,
$kendo-color-gradient-draghandle-focus-shadow: $kendo-color-gradient-draghandle-focus-shadow,
$kendo-color-gradient-draghandle-hover-shadow: $kendo-color-gradient-draghandle-hover-shadow,
$kendo-color-gradient-draghandle-shadow: $kendo-color-gradient-draghandle-shadow,
Expand Down
12 changes: 6 additions & 6 deletions packages/bootstrap/scss/icon/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $kendo-icon-spacing: k-spacing(1) !default;
/// @group icon
$kendo-icon-padding: k-spacing(1) !default;

:root {
/* :root {
--kendo-icon-size: var( --kendo-icon-size, 1rem );
--kendo-icon-size-xs: #{$kendo-icon-size-xs};
--kendo-icon-size-sm: #{$kendo-icon-size-sm};
Expand All @@ -32,10 +32,10 @@ $kendo-icon-padding: k-spacing(1) !default;
--kendo-icon-size-xxxl: #{$kendo-icon-size-xxxl};
--kendo-icon-spacing: #{$kendo-icon-spacing};
--kendo-icon-padding: #{$kendo-icon-padding};
}
} */


@forward "@progress/kendo-theme-default/scss/icon/_variables.scss" with (
/* @forward "@progress/kendo-theme-default/scss/icon/_variables.scss" with (
$kendo-icon-size: $kendo-icon-size,
$kendo-icon-size-xs: $kendo-icon-size-xs,
$kendo-icon-size-sm: $kendo-icon-size-sm,
Expand All @@ -44,6 +44,6 @@ $kendo-icon-padding: k-spacing(1) !default;
$kendo-icon-size-xl: $kendo-icon-size-xl,
$kendo-icon-size-xxl: $kendo-icon-size-xxl,
$kendo-icon-size-xxxl: $kendo-icon-size-xxxl,
$kendo-icon-spacing: $kendo-icon-spacing,
$kendo-icon-padding: $kendo-icon-padding
);
// $kendo-icon-spacing: $kendo-icon-spacing,
// $kendo-icon-padding: $kendo-icon-padding
); */
12 changes: 6 additions & 6 deletions packages/bootstrap/scss/icons/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "sass:map";
@use "../core/_index.scss" as *;
// @use "sass:map";
// @use "../core/_index.scss" as *;

/// Font sizes of the icons.
/// @group icon
Expand All @@ -21,7 +21,7 @@ $kendo-icon-spacing: k-spacing(1) !default;
/// @group icon
$kendo-icon-padding: k-spacing(1) !default;

:root {
/* :root {
--kendo-icon-size: var( --kendo-icon-size, 1rem );
--kendo-icon-size-xs: #{$kendo-icon-size-xs};
--kendo-icon-size-sm: #{$kendo-icon-size-sm};
Expand All @@ -32,7 +32,7 @@ $kendo-icon-padding: k-spacing(1) !default;
--kendo-icon-size-xxxl: #{$kendo-icon-size-xxxl};
--kendo-icon-spacing: #{$kendo-icon-spacing};
--kendo-icon-padding: #{$kendo-icon-padding};
}
} */


@forward "@progress/kendo-theme-default/scss/icons/_variables.scss" with (
Expand All @@ -44,6 +44,6 @@ $kendo-icon-padding: k-spacing(1) !default;
$kendo-icon-size-xl: $kendo-icon-size-xl,
$kendo-icon-size-xxl: $kendo-icon-size-xxl,
$kendo-icon-size-xxxl: $kendo-icon-size-xxxl,
$kendo-icon-spacing: $kendo-icon-spacing,
$kendo-icon-padding: $kendo-icon-padding
// $kendo-icon-spacing: $kendo-icon-spacing,
// $kendo-icon-padding: $kendo-icon-padding
);
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/list/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "sass:map";
// @use "sass:map";
@use "../core/_index.scss" as *;

// List
Expand Down
4 changes: 2 additions & 2 deletions packages/bootstrap/scss/map/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ $kendo-map-attribution-bg: if($kendo-enable-color-system, color-mix(in srgb, k-c
/// @group map
$kendo-map-marker-fill: $kendo-color-primary !default;

$kendo-map-marker-images: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAABQCAYAAAAKlxWDAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA35JREFUeNrsWF1IVEEUPu7amhKUmqUUkhEYYn9PamgbROKTEERB1HNP0pMvJUVhZQhCEEQPQiAIkiQIQShEZmg99SdLgiRJpbGmGIu/aZ2zzJXrvWf2zty7PgTzwQd3Z86Z796z58wMJ+PruXxQwCHkGeRpZDbyqBh/j1xA9iN7kJ+8FsrwECSRu8hSUMMosgnZLTMIScaLkUPIpxpiIGyfCN9iVcEo8h2yCvyjSqwR9RIkgz5kHgRHnlhrg2im7blEhCPCeW89fBJyKuohsv8IRPaV46uGYfnLhyTn3/bC4seXnFtErFmBHHcmzSCy2umRWVgC+ZfvQ1bZ8ZSfsxQbgl+PrsCfqXFu+jWyxh7Ss5xY1sFKKLzd5ymWtEWbpC36MKgWGuuCzdyXFTR2QGhbrvKfRrbkQ74Mmi3BKJf6FEYdMbso+UpKJkpJU+dKkPIaNoyrM5Mw23Edlj6/WQ957qVbEM4rcoWX1lgcGXQuURfi6o2y0YmVH2Mw2XgC5od6ksJEeqaxlW+joLIGaZFgGVcCTsx13YG1xKxrnMZoTmUN0iLB7c7R8M49LktJnSWxwMxxa5AWu5f+XV6EzQIJznHJwSWSDNlM+Fanv3OmcyQY43YNVyzOX2XLhMZoTvEviJHgsHOU9kYntuwthaLWV5BTWQ/hHbuSpGcaozmVNUiL9lIqfNfr7L7Rq7SlyfbVnzfZsjhFXzggTuoNoI14bf63thj5kK/kNvDCytIm5yzt+vF7F9jak4qhbbz1ouzEaLJv3t3iCNkYGtzCpq7Vrm9lKcNo2TIJJ/Kk23keHhB3kQLPAxhJUDiACXEkJcMYd2uzrhiRNNX5MrJW5Al7pxkQBjNpEJtxislubWRwjKtPDQyLNQZU76UTIu4NPsQahO+EzkXYwgNu60uBmPAB3Zu3HS0agp62KoJdsvAwf0NXOgQptdsU7NqEbWBBQrso4FQl0K56AKsggXzokVyJdAqmWjThlZl+BeOSsD32CLdvQSsxVu1XF2Sr7iVKB5T6nbbfnYol41vQWdwtus6ZPgRp+3pme950QV9fpito+jSmT2P6NKZP479PE9Lp06jC6tMwUO/T6CJwn0YXgfs0uvj/+jS6CNyn0UXgPo0uZH0aEnzueruRwUBfSb5Mr5TQb/o0pk9j+jSmT2P6NKZPY/o0pk9j+jQ+8E+AAQDpbNHEyW7DTAAAAABJRU5ErkJggg==";
$kendo-map-marker-images: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAABQCAYAAAAKlxWDAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA35JREFUeNrsWF1IVEEUPu7amhKUmqUUkhEYYn9PamgbROKTEERB1HNP0pMvJUVhZQhCEEQPQiAIkiQIQShEZmg99SdLgiRJpbGmGIu/aZ2zzJXrvWf2zty7PgTzwQd3Z86Z796z58wMJ+PruXxQwCHkGeRpZDbyqBh/j1xA9iN7kJ+8FsrwECSRu8hSUMMosgnZLTMIScaLkUPIpxpiIGyfCN9iVcEo8h2yCvyjSqwR9RIkgz5kHgRHnlhrg2im7blEhCPCeW89fBJyKuohsv8IRPaV46uGYfnLhyTn3/bC4seXnFtErFmBHHcmzSCy2umRWVgC+ZfvQ1bZ8ZSfsxQbgl+PrsCfqXFu+jWyxh7Ss5xY1sFKKLzd5ymWtEWbpC36MKgWGuuCzdyXFTR2QGhbrvKfRrbkQ74Mmi3BKJf6FEYdMbso+UpKJkpJU+dKkPIaNoyrM5Mw23Edlj6/WQ957qVbEM4rcoWX1lgcGXQuURfi6o2y0YmVH2Mw2XgC5od6ksJEeqaxlW+joLIGaZFgGVcCTsx13YG1xKxrnMZoTmUN0iLB7c7R8M49LktJnSWxwMxxa5AWu5f+XV6EzQIJznHJwSWSDNlM+Fanv3OmcyQY43YNVyzOX2XLhMZoTvEviJHgsHOU9kYntuwthaLWV5BTWQ/hHbuSpGcaozmVNUiL9lIqfNfr7L7Rq7SlyfbVnzfZsjhFXzggTuoNoI14bf63thj5kK/kNvDCytIm5yzt+vF7F9jak4qhbbz1ouzEaLJv3t3iCNkYGtzCpq7Vrm9lKcNo2TIJJ/Kk23keHhB3kQLPAxhJUDiACXEkJcMYd2uzrhiRNNX5MrJW5Al7pxkQBjNpEJtxislubWRwjKtPDQyLNQZU76UTIu4NPsQahO+EzkXYwgNu60uBmPAB3Zu3HS0agp62KoJdsvAwf0NXOgQptdsU7NqEbWBBQrso4FQl0K56AKsggXzokVyJdAqmWjThlZl+BeOSsD32CLdvQSsxVu1XF2Sr7iVKB5T6nbbfnYol41vQWdwtus6ZPgRp+3pme950QV9fpito+jSmT2P6NKZP479PE9Lp06jC6tMwUO/T6CJwn0YXgfs0uvj/+jS6CNyn0UXgPo0uZH0aEnzueruRwUBfSb5Mr5TQb/o0pk9j+jSmT2P6NKZPY/o0pk9j+jQ+8E+AAQDpbNHEyW7DTAAAAABJRU5ErkJggg==" !default;


@forward "@progress/kendo-theme-default/scss/map/_variables.scss" with (
Expand All @@ -96,5 +96,5 @@ $kendo-map-marker-images: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAB
$kendo-map-attribution-font-size: $kendo-map-attribution-font-size,
$kendo-map-attribution-bg: $kendo-map-attribution-bg,
$kendo-map-marker-fill: $kendo-map-marker-fill,
$kendo-map-marker-images: $kendo-map-marker-images
// $kendo-map-marker-images: $kendo-map-marker-images
);
10 changes: 5 additions & 5 deletions packages/bootstrap/scss/menu/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ $kendo-menu-scroll-button-hover-gradient: null !default;

/// The inline margin of the horizontal Menu separator.
/// @group menu
$kendo-menu-separator-margin-inline: k-spacing(1);
$kendo-menu-separator-margin-inline: k-spacing(1) !default;
/// The block margin of the horizontal Menu separator.
/// @group menu
$kendo-menu-separator-margin-block: k-spacing(2);;
$kendo-menu-separator-margin-block: k-spacing(2) !default;
/// The border color of Menu separator.
/// @group menu
$kendo-menu-separator-border: if($kendo-enable-color-system, k-color(border), $kendo-component-border) !default;
Expand Down Expand Up @@ -304,16 +304,16 @@ $kendo-menu-popup-item-focus-shadow: $kendo-menu-item-focus-shadow !default;
$kendo-menu-item-selected-text: $kendo-menu-item-selected-text,
$kendo-menu-item-selected-border: $kendo-menu-item-selected-border,
$kendo-menu-item-selected-gradient: $kendo-menu-item-selected-gradient,
$kendo-menu-scroll-button-bg: $kendo-menu-scroll-button-bg,
// $kendo-menu-scroll-button-bg: $kendo-menu-scroll-button-bg,
$kendo-menu-scroll-button-text: $kendo-menu-scroll-button-text,
$kendo-menu-scroll-button-border: $kendo-menu-scroll-button-border,
$kendo-menu-scroll-button-gradient: $kendo-menu-scroll-button-gradient,
$kendo-menu-scroll-button-hover-bg: $kendo-menu-scroll-button-hover-bg,
$kendo-menu-scroll-button-hover-text: $kendo-menu-scroll-button-hover-text,
$kendo-menu-scroll-button-hover-border: $kendo-menu-scroll-button-hover-border,
$kendo-menu-scroll-button-hover-gradient: $kendo-menu-scroll-button-hover-gradient,
$kendo-menu-separator-margin-inline: $kendo-menu-separator-margin-inline,
$kendo-menu-separator-margin-block: $kendo-menu-separator-margin-block,
// $kendo-menu-separator-margin-inline: $kendo-menu-separator-margin-inline,
// $kendo-menu-separator-margin-block: $kendo-menu-separator-margin-block,
$kendo-menu-separator-border: $kendo-menu-separator-border,
$kendo-menu-popup-padding-x: $kendo-menu-popup-padding-x,
$kendo-menu-popup-padding-y: $kendo-menu-popup-padding-y,
Expand Down
17 changes: 17 additions & 0 deletions packages/bootstrap/scss/notification/_functions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@use "sass:map";
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

@function notification-theme( $colors ) {
$_theme: ();

@each $name, $color in $colors {
$_theme: map.merge(( $name: (
color: if($kendo-enable-color-system, k-color( #{$name}-on-subtle ), k-color-shade( $color, 6 )),
background-color: if($kendo-enable-color-system, k-color( #{$name}-subtle ), k-color-tint( $color, 9 )),
border: if($kendo-enable-color-system, k-color( #{$name}-emphasis ), k-color-tint( $color, 10 )),
)), $_theme );
}

@return $_theme;
}
15 changes: 1 addition & 14 deletions packages/bootstrap/scss/notification/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "sass:map";
@use "../core/_index.scss" as *;
@use "./_functions.scss" as *;
@use "../popup/_variables.scss" as *;
@use "../icon/_variables.scss" as *;
@use "bootstrap/scss/bootstrap.scss" as *;
Expand Down Expand Up @@ -48,20 +49,6 @@ $kendo-notification-shadow: $kendo-popup-shadow !default;
/// @group notification
$kendo-notification-icon-spacing: $kendo-icon-spacing !default;

@function notification-theme( $colors ) {
$_theme: ();

@each $name, $color in $colors {
$_theme: map.merge(( $name: (
color: if($kendo-enable-color-system, k-color( #{$name}-on-subtle ), k-color-shade( $color, 6 )),
background-color: if($kendo-enable-color-system, k-color( #{$name}-subtle ), k-color-tint( $color, 9 )),
border: if($kendo-enable-color-system, k-color( #{$name}-emphasis ), k-color-tint( $color, 10 )),
)), $_theme );
}

@return $_theme;
}

/// The theme colors map for the Notification.
/// @group notification
$kendo-notification-theme-colors: $kendo-theme-colors !default;
Expand Down
2 changes: 1 addition & 1 deletion packages/bootstrap/scss/pager/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ $kendo-pager-sizes: (
$kendo-pager-border: $kendo-pager-border,
$kendo-pager-focus-bg: $kendo-pager-focus-bg,
$kendo-pager-focus-shadow: $kendo-pager-focus-shadow,
$kendo-pager-section-spacing: $kendo-pager-section-spacing,
// $kendo-pager-section-spacing: $kendo-pager-section-spacing,
$kendo-pager-item-border-width: $kendo-pager-item-border-width,
$kendo-pager-item-border-radius: $kendo-pager-item-border-radius,
$kendo-pager-item-spacing: $kendo-pager-item-spacing,
Expand Down
44 changes: 22 additions & 22 deletions packages/bootstrap/scss/panel/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,48 @@

/// The border radius of the Panel.
/// @group panel
$kendo-panel-border-radius: k-border-radius(md);
$kendo-panel-border-radius: k-border-radius(md) !default;
/// The width of the border around the Panel.
/// @group panel
$kendo-panel-border-width: 1px;
$kendo-panel-border-width: 1px !default;
/// The style of the border around the Panel.
/// @group panel
$kendo-panel-border-style: solid;
$kendo-panel-border-style: solid !default;

/// The inline padding of the Panel header.
/// @group panel
$kendo-panel-header-padding-inline: k-spacing(2);
$kendo-panel-header-padding-inline: k-spacing(2) !default;
/// The block padding of the Panel header.
/// @group panel
$kendo-panel-header-padding-block: k-spacing(1);
$kendo-panel-header-padding-block: k-spacing(1) !default;

/// The inline padding of the Panel content.
/// @group panel
$kendo-panel-content-padding-inline: k-spacing(2);
$kendo-panel-content-padding-inline: k-spacing(2) !default;
/// The block padding of the Panel content.
/// @group panel
$kendo-panel-content-padding-block: k-spacing(1);
$kendo-panel-content-padding-block: k-spacing(1) !default;

/// The text color of the Panel.
/// @group panel
$kendo-panel-text: var(--kendo-component-text, #{$kendo-component-text});
$kendo-panel-text: var(--kendo-component-text, #{$kendo-component-text}) !default;
/// The background color of the Panel.
/// @group panel
$kendo-panel-bg: var(--kendo-component-bg, #{$kendo-component-bg});
$kendo-panel-bg: var(--kendo-component-bg, #{$kendo-component-bg}) !default;
/// The color of the border around the Panel.
/// @group panel
$kendo-panel-border: var(--kendo-component-border, #{$kendo-component-border});
$kendo-panel-border: var(--kendo-component-border, #{$kendo-component-border}) !default;


@forward "@progress/kendo-theme-default/scss/panel/_variables.scss" with (
$kendo-panel-border-radius: $kendo-panel-border-radius,
$kendo-panel-border-width: $kendo-panel-border-width,
$kendo-panel-border-style: $kendo-panel-border-style,
$kendo-panel-header-padding-inline: $kendo-panel-header-padding-inline,
$kendo-panel-header-padding-block: $kendo-panel-header-padding-block,
$kendo-panel-content-padding-inline: $kendo-panel-content-padding-inline,
$kendo-panel-content-padding-block: $kendo-panel-content-padding-block,
$kendo-panel-text: $kendo-panel-text,
$kendo-panel-bg: $kendo-panel-bg,
$kendo-panel-border: $kendo-panel-border
);
// @forward "@progress/kendo-theme-default/scss/panel/_variables.scss" with (
// $kendo-panel-border-radius: $kendo-panel-border-radius,
// $kendo-panel-border-width: $kendo-panel-border-width,
// $kendo-panel-border-style: $kendo-panel-border-style,
// $kendo-panel-header-padding-inline: $kendo-panel-header-padding-inline,
// $kendo-panel-header-padding-block: $kendo-panel-header-padding-block,
// $kendo-panel-content-padding-inline: $kendo-panel-content-padding-inline,
// $kendo-panel-content-padding-block: $kendo-panel-content-padding-block,
// $kendo-panel-text: $kendo-panel-text,
// $kendo-panel-bg: $kendo-panel-bg,
// $kendo-panel-border: $kendo-panel-border
// );
17 changes: 17 additions & 0 deletions packages/bootstrap/scss/tooltip/_functions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@use "sass:map";
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

@function tooltip-theme( $colors ) {
$_theme: ();

@each $name, $color in $colors {
$_theme: map.merge(( $name: (
color: if($kendo-enable-color-system, k-color( on-#{$name} ), k-contrast-legacy( $color )),
background-color: $color,
border: $color,
)), $_theme );
}

@return $_theme;
}
16 changes: 1 addition & 15 deletions packages/bootstrap/scss/tooltip/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "sass:map";
@use "../core/_index.scss" as *;
@use "./_functions.scss" as *;
@use "bootstrap/scss/bootstrap.scss" as *;

// Tooltip
Expand Down Expand Up @@ -52,20 +52,6 @@ $kendo-tooltip-border: $kendo-tooltip-bg !default;
/// @group tooltip
$kendo-tooltip-shadow: k-elevation(2) !default;

@function tooltip-theme( $colors ) {
$_theme: ();

@each $name, $color in $colors {
$_theme: map.merge(( $name: (
color: if($kendo-enable-color-system, k-color( on-#{$name} ), k-contrast-legacy( $color )),
background-color: $color,
border: $color,
)), $_theme );
}

@return $_theme;
}

/// The theme colors map for the Tooltip.
/// @group tooltip
$kendo-tooltip-theme-colors: $kendo-theme-colors !default;
Expand Down

0 comments on commit ddd630f

Please sign in to comment.