@progress/kendo-theme-material 4.43.1-dev.5 → 4.43.1-dev.6

package/scss/button/_theme.scss

@@ -2,36 +2,36 @@
 
 @include exports( "button/theme/material" ) {
 
-    // Flat button
-    .k-button-flat {
-
-        &:disabled,
-        &.k-state-disabled {
-            color: $button-disabled-text;
+    // Solid button
+    @each $name, $color in $button-theme-colors {
+        .k-button-solid.k-button-solid-#{$name} {
+
+            &:disabled,
+            &.k-state-disabled {
+                @include fill(
+                    $button-disabled-text,
+                    $button-disabled-bg,
+                    $button-disabled-border
+                );
+            }
         }
     }
-    .k-button-flat.k-primary {
-        color: $primary-button-bg;
 
-        &:disabled,
-        &.k-state-disabled {
-            color: $button-disabled-text;
-        }
-    }
+    // Flat button
+    .k-button-flat {}
 
 
     // Outline button
     .k-button-outline {
-        @include box-shadow( none );
         color: $button-text;
 
         &:hover,
         &.k-state-hover,
+        &:focus,
+        &.k-state-focus,
         &:active,
         &.k-state-active,
-        &.k-state-selected,
-        &:focus,
-        &.k-state-focus {
+        &.k-state-selected {
             color: $button-text;
         }
 
@@ -40,18 +40,30 @@
             color: $button-disabled-text;
         }
     }
-    .k-button-outline.k-primary {
-        color: $primary-button-bg;
+    @each $name, $color in $button-theme-colors {
+        .k-button-outline.k-button-outline-#{$name} {
+            color: $color;
+
+            &:hover,
+            &.k-state-hover,
+            &:focus,
+            &.k-state-focus,
+            &:active,
+            &.k-state-active,
+            &.k-state-selected {
+                color: $color;
+            }
 
-        &:hover,
-        &.k-state-hover,
-        &:active,
-        &.k-state-active,
-        &.k-state-selected,
-        &:focus,
-        &.k-state-focus {
-            color: $primary-button-bg;
+            &:disabled,
+            &.k-state-disabled {
+                color: $button-disabled-text;
+            }
         }
+    }
+
+
+    // Link button
+    .k-button.k-button-link {
 
         &:disabled,
         &.k-state-disabled {
@@ -80,46 +92,21 @@
         }
 
         &:disabled,
+        &[disabled],
+        &.k-disabled,
         &.k-state-disabled {
             @include box-shadow( none );
-            opacity: 1;
         }
     }
 
 
     // Split button
-    .k-split-button {
-        @include box-shadow( $button-shadow );
-
-        .k-button {
-            @include box-shadow( none );
-        }
-
-        > .k-button:last-child,
-        > .k-split-button-arrow {
-            color: $subtle-text;
-        }
-
-        > .k-button:last-child:hover,
-        > .k-split-button-arrow:hover {
-            color: $button-text;
-        }
-
-        &:disabled,
-        &.k-state-disabled {
-            @include box-shadow( none );
-            opacity: 1;
-        }
-
-        &.k-flat {
-            @include box-shadow( none );
-        }
-    }
+    .k-split-button {}
 
 
     // Variant button group
     .k-button-group-flat,
-    .k-button-group-bare,
+    .k-button-group-link,
     .k-button-group-outline {
         @include box-shadow( none );
     }

package/scss/button/_variables.scss

@@ -1,29 +1,68 @@
 // Button
 
-/// Width of border around buttons
+/// Width of the border around the button.
 /// @group button
-$button-border-width: 0px !default;
-/// Border radius of buttons
+$button-border-width: 1px !default;
+
+/// Border radius of the button.
+/// @group button
+$button-border-radius: map-get( $spacing, 1 ) !default;
+
+/// Horizontal padding of the button.
 /// @group button
-$button-border-radius: $border-radius !default;
+$button-padding-x: map-get( $spacing, 4 ) !default;
+$button-padding-x-sm: null !default;
+$button-padding-x-md: null !default;
+$button-padding-x-lg: null !default;
 
-/// Horizontal padding of buttons
+/// Vertical padding of the button.
 /// @group button
-$button-padding-x: $padding-x !default;
-/// Vertical padding of buttons
+$button-padding-y: map-get( $spacing, 2 ) !default;
+$button-padding-y-sm: null !default;
+$button-padding-y-md: null !default;
+$button-padding-y-lg: null !default;
+
+/// Font family of the button.
 /// @group button
-$button-padding-y: 8px !default;
 $button-font-family: $font-family !default;
+
+/// Font size of the button.
+/// @group button
 $button-font-size: $font-size !default;
-$button-line-height: (20 / 14) !default;
+$button-font-size-sm: null !default;
+$button-font-size-md: null !default;
+$button-font-size-lg: null !default;
 
-$button-padding-x-sm: $button-padding-x / 2 !default;
-$button-padding-y-sm: $button-padding-y / 2 !default;
-$button-line-height-sm: (20 / 14) !default;
+/// Line height used along with $font-size.
+/// @group button
+$button-line-height: (20 / 14) !default;
+$button-line-height-sm: null !default;
+$button-line-height-md: null !default;
+$button-line-height-lg: null !default;
 
+/// Calculated height of the button.
+/// @group button
 $button-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} + #{$button-border-width * 2} ) !default;
+
+/// Calculated inner height of the button. Without the border width.
+/// @group button
 $button-inner-calc-size: calc( #{$button-line-height * 1em} + #{$button-padding-y * 2} ) !default;
 
+/// Theme colors map for the button.
+/// @group button
+$button-theme-colors: (
+    "primary": map-get( $theme-colors, primary ),
+    "secondary": map-get( $theme-colors, secondary ),
+    "tertiary": map-get( $theme-colors, tertiary ),
+    "info": map-get( $theme-colors, info ),
+    "success": map-get( $theme-colors, success ),
+    "warning": map-get( $theme-colors, warning ),
+    "error": map-get( $theme-colors, error ),
+    "dark": map-get( $theme-colors, dark ),
+    "light": map-get( $theme-colors, light ),
+    "inverse": map-get( $theme-colors, inverse )
+) !default;
+
 /// The background of the buttons.
 /// @group button
 $button-bg: $base-bg !default;
@@ -88,7 +127,7 @@ $button-focused-shadow: null !default;
 // Disabled button
 $button-disabled-bg: try-shade( $body-bg, 12% ) !default;
 $button-disabled-text: $disabled-text !default;
-$button-disabled-border: null !default;
+$button-disabled-border: $button-disabled-bg !default;
 $button-disabled-gradient: null !default;
 $button-disabled-shadow: none !default;
 
@@ -120,7 +159,31 @@ $primary-button-selected-shadow: null !default;
 
 $primary-button-focused-shadow: null !default;
 
-$button-group-focus-shadow: null !default;
+$solid-button-gradient: null !default;
+$solid-button-shade-function: "try-shade";
+$solid-button-shade-text-amount: null !default;
+$solid-button-shade-bg-amount: 0 !default;
+$solid-button-shade-border-amount: 0 !default;
+$solid-button-hover-shade-text-amount: null !default;
+$solid-button-hover-shade-bg-amount: null !default;
+$solid-button-hover-shade-border-amount: null !default;
+$solid-button-active-shade-text-amount: null !default;
+$solid-button-active-shade-bg-amount: null !default;
+$solid-button-active-shade-border-amount: null !default;
+$solid-button-shadow: null !default;
+$solid-button-shadow-blur: null !default;
+$solid-button-shadow-spread: null !default;
+$solid-button-shadow-opacity: null !default;
+
+$outline-button-shadow: null !default;
+$outline-button-shadow-blur: null !default;
+$outline-button-shadow-spread: null !default;
+$outline-button-shadow-opacity: null !default;
+
+$link-button-shadow: null !default;
+$link-button-shadow-blur: null !default;
+$link-button-shadow-spread: null !default;
+$link-button-shadow-opacity: null !default;
 
 $flat-button-hover-opacity: .08 !default;
 $flat-button-focus-opacity: .12 !default;

package/scss/maskedtextbox/_layout.scss

@@ -1 +1,12 @@
 @import "../../modules/@progress/kendo-theme-default/scss/maskedtextbox/_layout.scss";
+
+@include exports( "maskedtextbox/layout/material" ) {
+
+    // Masked textbox
+    .k-maskedtextbox {
+        @include border-bottom-radius( 0 !important ); // sass-lint:disable-line no-important
+        border-width: $input-border-width 0;
+        border-top-color: transparent !important; // sass-lint:disable-line no-important
+    }
+
+}

package/scss/toolbar/_theme.scss

@@ -4,13 +4,11 @@
 
     .k-toolbar {
 
-        .k-button,
-        .k-button-secondary {
+        .k-button {
             background-color: try-shade( $button-bg );
         }
 
-        .k-button-primary,
-        .k-button.k-primary {
+        .k-button-primary {
             background-color: $primary-button-bg;
 
             &:disabled,