Skip to content

Commit

Permalink
Merge branch 'core-utils-dart' into material-dart
Browse files Browse the repository at this point in the history
  • Loading branch information
zhpenkov authored Oct 17, 2024
2 parents f57bcb3 + bcdc42f commit 3036d2c
Show file tree
Hide file tree
Showing 39 changed files with 58 additions and 31 deletions.
2 changes: 1 addition & 1 deletion packages/core/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $kendo-enable-shadows: true !default;
$kendo-enable-rounded: true !default;
$kendo-enable-gradients: true !default;
$kendo-enable-transitions: true !default;
$kendo-nested-disabled: false !default;
$kendo-nested-disabled: true !default;
$kendo-enable-focus-contrast: false !default;

// Equilateral triangle variables
Expand Down
1 change: 1 addition & 0 deletions packages/core/scss/styles/_selection.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../color-system/_swatch-legacy.scss" as *;
@use "../color-system/_functions.import" as *;
@use "../_variables.scss" as *;

@mixin kendo-core--styles--selection() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/adaptive/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Adaptive
$kendo-adaptive-bg: $kendo-component-bg !default;
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/appbar/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-appbar--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/appbar/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// AppBar

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/avatar/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./_variables.scss" as *;

@mixin kendo-avatar--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/badge/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

@mixin kendo-badge--theme-base() {

Expand Down
14 changes: 7 additions & 7 deletions packages/default/scss/button/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@
&.k-hover {
@if $name == "base" {
@include fill(
if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color )),
if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )),
if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color ))
if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color ) ),
if($kendo-enable-color-system, k-color( on-base ), $color ),
if($kendo-enable-color-system, k-color( on-base ), $color )
);
} @else {
@include fill(
Expand Down Expand Up @@ -191,8 +191,8 @@
@if $name == "base" {
@include fill(
if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color )),
if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )),
if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color ))
if($kendo-enable-color-system, k-color( on-base ), $color ),
if($kendo-enable-color-system, k-color( on-base ), $color )
);
} @else {
@include fill(
Expand All @@ -208,8 +208,8 @@
@if $name == "base" {
@include fill(
if($kendo-enable-color-system, k-color( base ), k-contrast-legacy( $color )),
if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color )),
if($kendo-enable-color-system, k-color( on-base ), k-contrast-legacy( $color ))
if($kendo-enable-color-system, k-color( on-base ), $color ),
if($kendo-enable-color-system, k-color( on-base ), $color )
);
} @else {
@include fill(
Expand Down
2 changes: 2 additions & 0 deletions packages/default/scss/button/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@use "sass:map";
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Button

/// The width of the border around the Button.
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/card/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-card--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/chart-wizard/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Chart wizard

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/chat/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../toolbar/_variables.scss" as *;

// Chat
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/chip/_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 "../core/functions/index.import.scss" as *;
@use "../button/_variables.scss" as *;


Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/dialog/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-dialog--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/dropzone/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// DropZone

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/editor/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../input/_variables.scss" as *;

// Editor
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/fab/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-fab--theme-base() {
Expand Down
5 changes: 4 additions & 1 deletion packages/default/scss/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
@forward "./ripple/_index.scss";
@forward "./table/_index.scss";
@forward "./virtual-scroller/_index.scss";
@forward "./no-data/_index.scss";


// Indicators
Expand Down Expand Up @@ -183,6 +184,7 @@
@use "./ripple/_index.scss" as *;
@use "./table/_index.scss" as *;
@use "./virtual-scroller/_index.scss" as *;
@use "./no-data/_index.scss" as *;


// Indicators
Expand Down Expand Up @@ -347,14 +349,15 @@

// Primitive components
@include kendo-draggable--styles();
@include kendo-action-buttons--styles();
@include kendo-list--styles();
@include kendo-listgroup--styles();
@include kendo-action-buttons--styles();
@include kendo-overlay--styles();
@include kendo-popup--styles();
@include kendo-ripple--styles();
@include kendo-table--styles();
@include kendo-virtual-scroller--styles();
@include kendo-no-data--styles();


// Indicators
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/input/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../button/_variables.scss" as *;

// Input
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/list/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./_variables.scss" as *;

@mixin kendo-list--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/messagebox/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./_variables.scss" as *;

@mixin kendo-messagebox--theme-base() {
Expand Down
29 changes: 7 additions & 22 deletions packages/default/scss/no-data/_index.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,17 @@
@import "../core/_index.scss";


// Module meta
$_kendo-module-meta: (
name: "no-data",
dependencies: ()
);
// Component
@forward "./_variables.scss";
@use "./_layout.scss" as *;
@use "./_theme.scss" as *;

// Dependencies
@use "../core/_index.scss" as *;


// Component
@import "./_variables.scss";
@import "./_layout.scss";
@import "./_theme.scss";

// Register
@import "../core/module-system/index.import.scss";
@include module-register( $_kendo-module-meta... );

// Expose
@mixin kendo-no-data--styles() {
@include module-render( "no-data" ) {
@include import-once( "no-data" ) {
@include core-styles();
@include kendo-no-data--layout();
@include kendo-no-data--theme();
}
}

@if $kendo-auto-bootstrap {
@include kendo-no-data--styles();
}
2 changes: 2 additions & 0 deletions packages/default/scss/no-data/_layout.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "./variables.scss" as *;

@mixin kendo-no-data--layout-base() {

.k-no-data {
Expand Down
2 changes: 2 additions & 0 deletions packages/default/scss/no-data/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "./variables.scss" as *;

@mixin kendo-no-data--theme-base() {

.k-no-data {
Expand Down
2 changes: 2 additions & 0 deletions packages/default/scss/no-data/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../core/_index.scss" as *;

/// The minimum height of the 'No Data' text container.
/// @group no-data
$kendo-no-data-min-height: 140px !default;
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/notification/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "sass:map";
@use "../core/_index.scss" as *;
@use "../core/spacing/index.import.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../popup/_variables.scss" as *;

// Notification
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/panelbar/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../list/_variables.scss" as *;

// Panelbar
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/pivotgrid/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../table/_variables.scss" as *;
@use "../list/_variables.scss" as *;
@use "../grid/_variables.scss" as *;
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/progressbar/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-progressbar--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/progressbar/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// ProgressBar

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/scheduler/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-scheduler--theme-base() {
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/scheduler/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "sass:math";
@use "../core/_index.scss" as *;
@use "../core/spacing/index.import.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../toolbar/_variables.scss" as *;
@use "../calendar/_variables.scss" as *;

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/slider/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Slider
/// The default size of the Slider.
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/splitter/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Splitter

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/stepper/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Stepper

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/switch/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;

// Switch

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/taskboard/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../card/_variables.scss" as *;

// TaskBoard
Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/timeline/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@use "../core/_index.scss" as *;
@use "../core/spacing/index.import.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "../button/_variables.scss" as *;
@use "../card/_variables.scss" as *;

Expand Down
1 change: 1 addition & 0 deletions packages/default/scss/window/_theme.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../core/_index.scss" as *;
@use "../core/functions/index.import.scss" as *;
@use "./variables.scss" as *;

@mixin kendo-window--theme-base() {
Expand Down

0 comments on commit 3036d2c

Please sign in to comment.