@progress/kendo-theme-default 10.2.0-dev.1 → 10.2.0-dev.2

package/scss/typography/_layout.scss

@@ -1,127 +1,4 @@
-@use "sass:map";
-@use "../core/_index.scss" as *;
-@use "../_variables.scss" as *;
-@use "./_variables.scss" as *;
-
-@mixin kendo-typography--layout-base() {
-
-    @if $kendo-enable-typography {
-        body { @extend .k-body !optional; }
-        h1 { @extend .k-h1 !optional; }
-        h2 { @extend .k-h2 !optional; }
-        h3 { @extend .k-h3 !optional; }
-        h4 { @extend .k-h4 !optional; }
-        h5 { @extend .k-h5 !optional; }
-        h6 { @extend .k-h6 !optional; }
-        p { @extend .k-paragraph !optional; }
-        pre { @extend .k-pre !optional; }
-        code { @extend .k-code !optional; }
-    }
-
-    // TODO delete k-typography class for R1 2022
-    .k-body,
-    .k-typography {
-        @include typography(
-            var( --kendo-font-size, inherit ),
-            var( --kendo-font-family, inherit ),
-            var( --kendo-line-height, normal ),
-            var( --kendo-font-weight-normal, normal ),
-            var( --kendo-letter-spacing, normal )
-        );
-        margin: 0;
-
-        p {
-            margin: $kendo-paragraph-margin;
-        }
-    }
-
-    // Headings
-    @each $heading, $heading-props in $kendo-headings {
-        $_font-size: map.get( $heading-props, font-size );
-        $_font-family: map.get( $heading-props, font-family );
-        $_line-height: map.get( $heading-props, line-height );
-        $_font-weight: map.get( $heading-props, font-weight );
-        $_letter-spacing: map.get( $heading-props, letter-spacing );
-        $_margin: map.get( $heading-props, margin );
-
-        .k-#{$heading} {
-            @include typography(
-                var( --kendo-#{$heading}-font-size, #{$_font-size} ),
-                var( --kendo-#{$heading}-font-family, #{$_font-family} ),
-                var( --kendo-#{$heading}-line-height, #{$_line-height} ),
-                var( --kendo-#{$heading}-font-weight, #{$_font-weight} ),
-                var( --kendo-#{$heading}-letter-spacing, #{$_letter-spacing} ),
-            );
-            margin: var( --kendo-#{$heading}-margin, #{$_margin} );
-        }
-    }
-
-    // Paragraph
-    .k-paragraph {
-        @include typography(
-            var( --kendo-paragraph-font-size, #{$kendo-paragraph-font-size}),
-            var( --kendo-paragraph-font-family, #{$kendo-paragraph-font-family}),
-            var( --kendo-paragraph-line-height, #{$kendo-paragraph-line-height}),
-            var( --kendo-paragraph-font-weight, #{$kendo-paragraph-font-weight}),
-            var( --kendo-paragraph-letter-spacing, #{$kendo-paragraph-letter-spacing})
-        );
-        margin: var( --kendo-paragraph-margin, #{$kendo-paragraph-margin});
-    }
-
-    // Code snippet
-    .k-pre,
-    .k-code {
-        @include typography(
-            var( --kendo-code-font-size, #{$kendo-code-font-size}),
-            var( --kendo-code-font-family, #{$kendo-code-font-family}),
-            var( --kendo-code-line-height, #{$kendo-code-line-height}),
-            var( --kendo-code-font-weight, #{$kendo-code-font-weight}),
-            var( --kendo-code-letter-spacing, #{$kendo-code-letter-spacing})
-        );
-        border-style: solid;
-        border-width: $kendo-code-border-width;
-    }
-
-    .k-pre {
-        padding-block: $kendo-pre-padding-y;
-        padding-inline: $kendo-pre-padding-x;
-        overflow: auto;
-    }
-
-    .k-pre > .k-code {
-        padding: 0;
-        border-width: 0;
-        border-color: transparent;
-        background-color: transparent;
-        font-family: inherit;
-        font-size: inherit;
-    }
-
-    .k-code {
-        padding-block: $kendo-code-padding-y;
-        padding-inline: $kendo-code-padding-x;
-    }
-
-    // Display
-    @each $display, $kendo-display-props in $kendo-display {
-        $_font-size: map.get( $kendo-display-props, font-size );
-        $_font-family: map.get( $kendo-display-props, font-family );
-        $_line-height: map.get( $kendo-display-props, line-height );
-        $_font-weight: map.get( $kendo-display-props, font-weight );
-        $_letter-spacing: map.get( $kendo-display-props, letter-spacing );
-        $_margin: map.get( $kendo-display-props, margin );
-
-        .k-display-#{$display} {
-            @include typography(
-                var( --kendo-display#{$display}-font-size, #{$_font-size} ),
-                var( --kendo-display#{$display}-font-family, #{$_font-family} ),
-                var( --kendo-display#{$display}-line-height, #{$_line-height} ),
-                var( --kendo-display#{$display}-font-weight, #{$_font-weight} ),
-                var( --kendo-display#{$display}-letter-spacing, #{$_letter-spacing} ),
-            );
-        }
-    }
-}
+@use "@progress/kendo-theme-core/scss/components/typography/_layout.scss" as *;
 
 
 @mixin kendo-typography--layout() {

package/scss/typography/_theme.scss

@@ -1,27 +1,4 @@
-@use "../core/_index.scss" as *;
-@use "../core/mixins/index.import.scss" as *;
-@use "./_variables.scss" as *;
-
-@mixin kendo-typography--theme-base() {
-
-    .k-body {
-        @include fill(
-            $kendo-body-text,
-            $kendo-body-bg
-        );
-    }
-
-    // Code snippet
-    .k-pre,
-    .k-code {
-        @include fill(
-            $kendo-code-text,
-            $kendo-code-bg,
-            $kendo-code-border
-        );
-    }
-
-}
+@use "@progress/kendo-theme-core/scss/components/typography/_theme.scss" as *;
 
 
 @mixin kendo-typography--theme() {

package/scss/typography/_variables.scss

@@ -336,3 +336,83 @@ $kendo-display: (
         letter-spacing: $kendo-display4-letter-spacing
     )
 ) !default;
+
+@forward "@progress/kendo-theme-core/scss/components/typography/_variables.scss" with (
+    $kendo-h1-font-size: $kendo-h1-font-size,
+    $kendo-h2-font-size: $kendo-h2-font-size,
+    $kendo-h3-font-size: $kendo-h3-font-size,
+    $kendo-h4-font-size: $kendo-h4-font-size,
+    $kendo-h5-font-size: $kendo-h5-font-size,
+    $kendo-h6-font-size: $kendo-h6-font-size,
+    $kendo-h1-font-family: $kendo-h1-font-family,
+    $kendo-h2-font-family: $kendo-h2-font-family,
+    $kendo-h3-font-family: $kendo-h3-font-family,
+    $kendo-h4-font-family: $kendo-h4-font-family,
+    $kendo-h5-font-family: $kendo-h5-font-family,
+    $kendo-h6-font-family: $kendo-h6-font-family,
+    $kendo-h1-line-height: $kendo-h1-line-height,
+    $kendo-h2-line-height: $kendo-h2-line-height,
+    $kendo-h3-line-height: $kendo-h3-line-height,
+    $kendo-h4-line-height: $kendo-h4-line-height,
+    $kendo-h5-line-height: $kendo-h5-line-height,
+    $kendo-h6-line-height: $kendo-h6-line-height,
+    $kendo-h1-font-weight: $kendo-h1-font-weight,
+    $kendo-h2-font-weight: $kendo-h2-font-weight,
+    $kendo-h3-font-weight: $kendo-h3-font-weight,
+    $kendo-h4-font-weight: $kendo-h4-font-weight,
+    $kendo-h5-font-weight: $kendo-h5-font-weight,
+    $kendo-h6-font-weight: $kendo-h6-font-weight,
+    $kendo-h1-letter-spacing: $kendo-h1-letter-spacing,
+    $kendo-h2-letter-spacing: $kendo-h2-letter-spacing,
+    $kendo-h3-letter-spacing: $kendo-h3-letter-spacing,
+    $kendo-h4-letter-spacing: $kendo-h4-letter-spacing,
+    $kendo-h5-letter-spacing: $kendo-h5-letter-spacing,
+    $kendo-h6-letter-spacing: $kendo-h6-letter-spacing,
+    $kendo-h1-margin: $kendo-h1-margin,
+    $kendo-h2-margin: $kendo-h2-margin,
+    $kendo-h3-margin: $kendo-h3-margin,
+    $kendo-h4-margin: $kendo-h4-margin,
+    $kendo-h5-margin: $kendo-h5-margin,
+    $kendo-h6-margin: $kendo-h6-margin,
+    $kendo-headings: $kendo-headings,
+    $kendo-paragraph-margin: $kendo-paragraph-margin,
+    $kendo-paragraph-font-size: $kendo-paragraph-font-size,
+    $kendo-paragraph-font-family: $kendo-paragraph-font-family,
+    $kendo-paragraph-line-height: $kendo-paragraph-line-height,
+    $kendo-paragraph-font-weight: $kendo-paragraph-font-weight,
+    $kendo-paragraph-letter-spacing: $kendo-paragraph-letter-spacing,
+    $kendo-code-font-size: $kendo-code-font-size,
+    $kendo-code-font-family: $kendo-code-font-family,
+    $kendo-code-line-height: $kendo-code-line-height,
+    $kendo-code-font-weight: $kendo-code-font-weight,
+    $kendo-code-letter-spacing: $kendo-code-letter-spacing,
+    $kendo-code-padding-x: $kendo-code-padding-x,
+    $kendo-code-padding-y: $kendo-code-padding-y,
+    $kendo-pre-padding-x: $kendo-pre-padding-x,
+    $kendo-pre-padding-y: $kendo-pre-padding-y,
+    $kendo-code-border-width: $kendo-code-border-width,
+    $kendo-code-bg: $kendo-code-bg,
+    $kendo-code-text: $kendo-code-text,
+    $kendo-code-border: $kendo-code-border,
+    $kendo-display1-font-size: $kendo-display1-font-size,
+    $kendo-display2-font-size: $kendo-display2-font-size,
+    $kendo-display3-font-size: $kendo-display3-font-size,
+    $kendo-display4-font-size: $kendo-display4-font-size,
+    $kendo-display1-font-family: $kendo-display1-font-family,
+    $kendo-display2-font-family: $kendo-display2-font-family,
+    $kendo-display3-font-family: $kendo-display3-font-family,
+    $kendo-display4-font-family: $kendo-display4-font-family,
+    $kendo-display1-line-height: $kendo-display1-line-height,
+    $kendo-display2-line-height: $kendo-display2-line-height,
+    $kendo-display3-line-height: $kendo-display3-line-height,
+    $kendo-display4-line-height: $kendo-display4-line-height,
+    $kendo-display1-font-weight: $kendo-display1-font-weight,
+    $kendo-display2-font-weight: $kendo-display2-font-weight,
+    $kendo-display3-font-weight: $kendo-display3-font-weight,
+    $kendo-display4-font-weight: $kendo-display4-font-weight,
+    $kendo-display1-letter-spacing: $kendo-display1-letter-spacing,
+    $kendo-display2-letter-spacing: $kendo-display2-letter-spacing,
+    $kendo-display3-letter-spacing: $kendo-display3-letter-spacing,
+    $kendo-display4-letter-spacing: $kendo-display4-letter-spacing,
+    $kendo-display: $kendo-display
+);

package/scss/upload/_layout.scss

@@ -1,251 +1,4 @@
-@use "../core/_index.scss" as *;
-@use "./variables.scss" as *;
-@use "../icons/_variables.scss" as *;
-
-@mixin kendo-upload--layout-base() {
-
-    .k-upload {
-        border-width: $kendo-upload-border-width;
-        border-style: solid;
-        box-sizing: border-box;
-        outline: 0;
-        font-family: $kendo-upload-font-family;
-        font-size: $kendo-upload-font-size;
-        line-height: $kendo-upload-line-height;
-        position: relative;
-        display: block;
-        -webkit-touch-callout: none;
-        -webkit-tap-highlight-color: $kendo-color-rgba-transparent;
-
-        *,
-        *::before,
-        *::after {
-            box-sizing: border-box;
-        }
-
-        .k-upload-button {
-            min-width: 7em;
-        }
-
-        // Drop zone
-        .k-dropzone,
-        .k-upload-dropzone {
-            padding-block: $kendo-upload-dropzone-padding-y;
-            padding-inline: $kendo-upload-dropzone-padding-x;
-            border-width: 0;
-            text-align: end;
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            position: relative;
-            background-color: transparent;
-
-            .k-dropzone-hint {
-                font-style: normal;
-                font-weight: normal;
-                white-space: nowrap;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                position: relative;
-                flex: 1;
-            }
-
-            .k-upload-status {
-                font-weight: normal;
-                display: flex;
-                align-items: center;
-                position: relative;
-
-                > .k-icon {
-                    margin-inline-end: $kendo-upload-icon-spacing;
-                }
-            }
-
-            .k-upload-status + .k-dropzone-hint {
-                display: none;
-            }
-        }
-
-        .k-dropzone-active {
-            .k-upload-status {
-                display: none;
-            }
-
-            .k-upload-status + .k-dropzone-hint {
-                display: block;
-            }
-        }
-
-        // Upload files list
-        .k-upload-files {
-            max-height: $kendo-upload-max-height;
-            overflow-y: auto;
-            margin: 0;
-            padding: 0;
-            border-width: 1px 0 0;
-            border-style: solid;
-            border-color: inherit;
-            list-style: none;
-
-            .k-file-multiple,
-            .k-file-single {
-                width: 100%;
-                display: flex;
-                justify-content: space-between;
-            }
-
-            .k-file-single {
-                align-items: center;
-            }
-
-            .k-file-multiple {
-                align-items: flex-start;
-            }
-
-            .k-file {
-                padding: $kendo-upload-item-padding-y $kendo-upload-item-padding-x calc(#{$kendo-upload-item-padding-y} + #{$kendo-upload-progress-thickness});
-                border-width: 0 0 1px;
-                border-style: solid;
-                outline: none;
-                display: flex;
-                align-items: flex-start;
-                position: relative;
-            }
-
-            .k-file:last-child {
-                border-width: 0;
-            }
-
-            .k-filename {
-                margin-left: k-spacing(4);
-                flex: 1;
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                position: relative;
-            }
-
-            .k-upload-pct {
-                margin-block: 0;
-                margin-inline: $kendo-upload-icon-spacing;
-                font-weight: normal;
-                vertical-align: middle;
-            }
-
-            ~ .k-clear-selected,
-            ~ .k-upload-selected {
-                margin-top: $kendo-upload-files-list-margin;
-                border-width: 0;
-            }
-
-            ~ .k-upload-selected {
-                border-left-width: 1px;
-                border-left-style: solid;
-                margin-left: -1px;
-            }
-
-            .k-file-name,
-            .k-file-size,
-            .k-file-validation-message,
-            .k-file-summary {
-                display: block;
-            }
-
-            .k-file-name {
-                overflow: hidden;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                position: relative;
-            }
-
-            .k-file-size,
-            .k-file-summary,
-            .k-file-validation-message {
-                font-size: $kendo-upload-validation-font-size;
-                line-height: $kendo-upload-validation-line-height;
-            }
-
-
-            .k-file-icon-wrapper {
-
-                .k-file-state {
-                    position: absolute;
-                }
-            }
-
-            .k-file-state {
-                visibility: hidden;
-            }
-        }
-
-        .k-upload-files .k-file-info {
-            min-height: $kendo-icon-size-xxl;
-            display: block;
-            overflow: hidden;
-            flex: 1 0 0;
-        }
-
-        .k-multiple-files-wrapper,
-        .k-file-single > .k-file-info {
-            margin-inline-start: $kendo-upload-file-info-margin;
-            min-height: $kendo-icon-size-xxl;
-            display: block;
-            overflow: hidden;
-            flex: 1 0 0;
-        }
-
-        .k-multiple-files-wrapper {
-            .k-file-info {
-                margin-bottom: $kendo-upload-multiple-items-spacing;
-                display: block;
-            }
-
-            .k-file-summary {
-                margin-top: calc( calc( #{$kendo-upload-multiple-items-spacing} / 3) * -1 );
-            }
-        }
-
-        .k-progressbar {
-            --kendo-progressbar-height: #{$kendo-upload-progress-thickness};
-            position: absolute;
-            left: $kendo-upload-item-padding-x;
-            right: $kendo-upload-item-padding-x;
-            bottom: calc( #{$kendo-upload-item-padding-y} / 2 );
-            width: auto;
-        }
-
-        // Action buttons
-        .k-actions {
-            border-top-width: 1px;
-        }
-
-    }
-
-    .k-upload-button-wrap {
-        position: relative;
-        direction: ltr;
-
-        input {
-            // font should not depend on outside styles, otherwise upload may break
-            font: 170px monospace !important; // stylelint-disable-line declaration-no-important
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-            opacity: 0;
-            cursor: pointer;
-            position: absolute;
-            bottom: 0;
-            right: 0;
-            z-index: 1;
-        }
-        input[disabled],
-        input.k-disabled {
-            visibility: hidden;
-        }
-    }
-
-}
+@use "@progress/kendo-theme-core/scss/components/upload/_layout.scss" as *;
 
 
 @mixin kendo-upload--layout() {

package/scss/upload/_theme.scss

@@ -1,108 +1,4 @@
-@use "../core/_index.scss" as *;
-@use "./variables.scss" as *;
-
-@mixin kendo-upload--theme-base() {
-
-    .k-upload {
-        @include fill(
-            $kendo-upload-text,
-            $kendo-upload-bg,
-            $kendo-upload-border
-        );
-
-        .k-dropzone,
-        .k-upload-dropzone {
-            @include fill(
-                $kendo-upload-dropzone-text,
-                $kendo-upload-dropzone-bg,
-                $kendo-upload-dropzone-border
-            );
-
-            &.k-hover {
-                background-color: $kendo-upload-dropzone-hover-bg;
-            }
-
-            .k-dropzone-hint {
-                color: $kendo-upload-status-text;
-                opacity: $kendo-upload-status-text-opacity;
-            }
-
-        }
-
-        .k-upload-files,
-        .k-file {
-            border-color: $kendo-upload-border;
-        }
-
-        .k-file {
-            &.k-focus {
-                @include focus-indicator( $indicator: ( inset $kendo-upload-focus-shadow ), $inset: true );
-            }
-
-            .k-upload-action.k-focus {
-                @include focus-indicator( $kendo-upload-focus-shadow );
-            }
-
-        }
-
-        .k-upload-status {
-            color: $kendo-upload-status-text;
-            opacity: $kendo-upload-status-text-opacity;
-        }
-
-        // Upload status: uploading
-        .k-file-progress {
-            .k-progressbar .k-selected {
-                background-color: $kendo-upload-progress-bg;
-            }
-        }
-
-
-        // Upload status: success
-        .k-file-success {
-            .k-file-validation-message {
-                color: $kendo-upload-success-text;
-            }
-
-            .k-progressbar .k-selected {
-                background-color: $kendo-upload-success-bg;
-            }
-        }
-
-        // Upload status: error
-        .k-file-error {
-            .k-file-validation-message {
-                color: $kendo-upload-error-text;
-            }
-            .k-progressbar .k-selected {
-                background-color: $kendo-upload-error-bg;
-            }
-        }
-
-        .k-file-icon-wrapper {
-            color: $kendo-upload-icon-color;
-            border-color: $kendo-upload-icon-color;
-        }
-
-        .k-file-size,
-        .k-file-validation-message,
-        .k-file-summary {
-            color: $kendo-subtle-text;
-        }
-
-        .k-multiple-files-wrapper .k-file-summary {
-            color: $kendo-upload-text;
-        }
-
-        // Invalid,
-        &.k-invalid,
-        &.ng-invalid.ng-touched,
-        &.ng-invalid.ng-dirty {
-            border-color: $kendo-invalid-border;
-        }
-    }
-
-}
+@use "@progress/kendo-theme-core/scss/components/upload/_theme.scss" as *;
 
 
 @mixin kendo-upload--theme() {

package/scss/upload/_variables.scss

@@ -107,3 +107,38 @@ $kendo-upload-focus-shadow: 0 0 0 2px rgba(0, 0, 0, .13) !default;
 $kendo-upload-files-list-margin: calc( -1 * #{k-spacing(1)} ) !default;
 
 $kendo-upload-file-info-margin: k-spacing(2) !default;
+
+@forward "@progress/kendo-theme-core/scss/components/upload/_variables.scss" with (
+    $kendo-upload-border-width: $kendo-upload-border-width,
+    $kendo-upload-font-family: $kendo-upload-font-family,
+    $kendo-upload-font-size: $kendo-upload-font-size,
+    $kendo-upload-line-height: $kendo-upload-line-height,
+    $kendo-upload-max-height: $kendo-upload-max-height,
+    $kendo-upload-text: $kendo-upload-text,
+    $kendo-upload-bg: $kendo-upload-bg,
+    $kendo-upload-border: $kendo-upload-border,
+    $kendo-upload-dropzone-padding-x: $kendo-upload-dropzone-padding-x,
+    $kendo-upload-dropzone-padding-y: $kendo-upload-dropzone-padding-y,
+    $kendo-upload-dropzone-text: $kendo-upload-dropzone-text,
+    $kendo-upload-dropzone-bg: $kendo-upload-dropzone-bg,
+    $kendo-upload-dropzone-border: $kendo-upload-dropzone-border,
+    $kendo-upload-dropzone-hover-bg: $kendo-upload-dropzone-hover-bg,
+    $kendo-upload-status-text: $kendo-upload-status-text,
+    $kendo-upload-status-text-opacity: $kendo-upload-status-text-opacity,
+    $kendo-upload-item-padding-x: $kendo-upload-item-padding-x,
+    $kendo-upload-item-padding-y: $kendo-upload-item-padding-y,
+    $kendo-upload-multiple-items-spacing: $kendo-upload-multiple-items-spacing,
+    $kendo-upload-validation-font-size: $kendo-upload-validation-font-size,
+    $kendo-upload-validation-line-height: $kendo-upload-validation-line-height,
+    $kendo-upload-icon-spacing: $kendo-upload-icon-spacing,
+    $kendo-upload-icon-color: $kendo-upload-icon-color,
+    $kendo-upload-progress-thickness: $kendo-upload-progress-thickness,
+    $kendo-upload-progress-bg: $kendo-upload-progress-bg,
+    $kendo-upload-success-text: $kendo-upload-success-text,
+    $kendo-upload-success-bg: $kendo-upload-success-bg,
+    $kendo-upload-error-text: $kendo-upload-error-text,
+    $kendo-upload-error-bg: $kendo-upload-error-bg,
+    $kendo-upload-focus-shadow: $kendo-upload-focus-shadow,
+    $kendo-upload-files-list-margin: $kendo-upload-files-list-margin,
+    $kendo-upload-file-info-margin: $kendo-upload-file-info-margin
+);

package/scss/validator/_layout.scss

@@ -1,28 +1,4 @@
-@use "../tooltip/_variables.scss" as *;
-
-@mixin kendo-validator--layout-base() {
-
-    // Validator
-    .k-validator {}
-
-
-    // Validator tooltip
-    .k-validator-tooltip {
-        margin-top: calc( #{$kendo-tooltip-callout-size} + #{$kendo-tooltip-border-width} );
-        width: auto;
-        white-space: normal;
-        display: flex;
-        align-items: center;
-        // NOTE: This works around popup / tooltip stacking issue
-        z-index: 9999;
-
-        // .k-callout-n { inset-inline-start: 16px; }
-    }
-    .k-grid .k-validator-tooltip {
-        max-width: 300px;
-    }
-
-}
+@use "@progress/kendo-theme-core/scss/components/validator/_layout.scss" as *;
 
 
 @mixin kendo-validator--layout() {

package/scss/validator/_theme.scss

@@ -1,9 +1,4 @@
-@mixin kendo-validator--theme-base() {
-
-    // Validator
-    .k-validator {}
-
-}
+@use "@progress/kendo-theme-core/scss/components/validator/_theme.scss" as *;
 
 
 @mixin kendo-validator--theme() {