From 00195feb29ccf250265780c4164f8c96b51ea537 Mon Sep 17 00:00:00 2001 From: joneff Date: Thu, 21 Jul 2022 18:08:07 +0300 Subject: [PATCH] feat(time-selector): add sizes for time-selector component --- packages/bootstrap/scss/list/_variables.scss | 4 +- .../scss/timeselector/_variables.scss | 38 +++++++++++++++++++ packages/classic/scss/list/_variables.scss | 4 +- .../classic/scss/timeselector/_variables.scss | 38 +++++++++++++++++++ packages/default/scss/list/_variables.scss | 4 +- .../default/scss/timeselector/_layout.scss | 30 +++++++++++++++ .../default/scss/timeselector/_variables.scss | 38 +++++++++++++++++++ .../scss/timeselector/_variables.scss | 38 +++++++++++++++++++ 8 files changed, 188 insertions(+), 6 deletions(-) diff --git a/packages/bootstrap/scss/list/_variables.scss b/packages/bootstrap/scss/list/_variables.scss index a024a4e19de..25cbb5bd553 100644 --- a/packages/bootstrap/scss/list/_variables.scss +++ b/packages/bootstrap/scss/list/_variables.scss @@ -11,8 +11,8 @@ $kendo-list-font-size-lg: $font-size-md !default; /// @group list $kendo-list-line-height: null !default; $kendo-list-line-height-sm: (20 / 14) !default; -$kendo-list-line-height-md: null !default; -$kendo-list-line-height-lg: null !default; +$kendo-list-line-height-md: $line-height-md !default; +$kendo-list-line-height-lg: $line-height-md !default; /// Horizontal padding of list header, if no size is set. /// @group list diff --git a/packages/bootstrap/scss/timeselector/_variables.scss b/packages/bootstrap/scss/timeselector/_variables.scss index 4a5b95f1217..5da9066c3a3 100644 --- a/packages/bootstrap/scss/timeselector/_variables.scss +++ b/packages/bootstrap/scss/timeselector/_variables.scss @@ -30,3 +30,41 @@ $time-list-highlight-bg: $component-bg !default; $time-list-highlight-border: $component-border !default; $time-list-focused-bg: rgba(0, 0, 0, .02) !default; + + +// Time selector sizes +$kendo-time-selector-sm-font-size: $kendo-list-font-size-sm !default; +$kendo-time-selector-sm-line-height: $kendo-list-line-height-sm !default; +$kendo-time-selector-sm-list-item-padding-x: $kendo-list-item-padding-x-sm !default; +$kendo-time-selector-sm-list-item-padding-y: $kendo-list-item-padding-y-sm !default; + +$kendo-time-selector-md-font-size: $kendo-list-font-size-md !default; +$kendo-time-selector-md-line-height: $kendo-list-line-height-md !default; +$kendo-time-selector-md-list-item-padding-x: $kendo-list-item-padding-x-md !default; +$kendo-time-selector-md-list-item-padding-y: $kendo-list-item-padding-y-md !default; + +$kendo-time-selector-lg-font-size: $kendo-list-font-size-lg !default; +$kendo-time-selector-lg-line-height: $kendo-list-line-height-lg !default; +$kendo-time-selector-lg-list-item-padding-x: $kendo-list-item-padding-x-lg !default; +$kendo-time-selector-lg-list-item-padding-y: $kendo-list-item-padding-y-lg !default; + +$kendo-time-selector-sizes: ( + sm: ( + font-size: $kendo-time-selector-sm-font-size, + line-height: $kendo-time-selector-sm-line-height, + list-item-padding-x: $kendo-time-selector-sm-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-sm-list-item-padding-y + ), + md: ( + font-size: $kendo-time-selector-md-font-size, + line-height: $kendo-time-selector-md-line-height, + list-item-padding-x: $kendo-time-selector-md-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-md-list-item-padding-y + ), + lg: ( + font-size: $kendo-time-selector-lg-font-size, + line-height: $kendo-time-selector-lg-line-height, + list-item-padding-x: $kendo-time-selector-lg-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-lg-list-item-padding-y + ) +) !default; diff --git a/packages/classic/scss/list/_variables.scss b/packages/classic/scss/list/_variables.scss index 2b8843e2238..727fdc8eaf1 100644 --- a/packages/classic/scss/list/_variables.scss +++ b/packages/classic/scss/list/_variables.scss @@ -10,8 +10,8 @@ $kendo-list-font-size-lg: $font-size-lg !default; /// Line height of the list component, if no size is set. /// @group list $kendo-list-line-height: null !default; -$kendo-list-line-height-sm: null !default; -$kendo-list-line-height-md: null !default; +$kendo-list-line-height-sm: $line-height-md !default; +$kendo-list-line-height-md: $line-height-md !default; $kendo-list-line-height-lg: $line-height-lg !default; /// Horizontal padding of list header, if no size is set. diff --git a/packages/classic/scss/timeselector/_variables.scss b/packages/classic/scss/timeselector/_variables.scss index 6da99b37a56..679a4ba4b5e 100644 --- a/packages/classic/scss/timeselector/_variables.scss +++ b/packages/classic/scss/timeselector/_variables.scss @@ -30,3 +30,41 @@ $time-list-highlight-bg: $component-bg !default; $time-list-highlight-border: $component-border !default; $time-list-focused-bg: rgba(0, 0, 0, .04) !default; + + +// Time selector sizes +$kendo-time-selector-sm-font-size: $kendo-list-font-size-sm !default; +$kendo-time-selector-sm-line-height: $kendo-list-line-height-sm !default; +$kendo-time-selector-sm-list-item-padding-x: $kendo-list-item-padding-x-sm !default; +$kendo-time-selector-sm-list-item-padding-y: $kendo-list-item-padding-y-sm !default; + +$kendo-time-selector-md-font-size: $kendo-list-font-size-md !default; +$kendo-time-selector-md-line-height: $kendo-list-line-height-md !default; +$kendo-time-selector-md-list-item-padding-x: $kendo-list-item-padding-x-md !default; +$kendo-time-selector-md-list-item-padding-y: $kendo-list-item-padding-y-md !default; + +$kendo-time-selector-lg-font-size: $kendo-list-font-size-lg !default; +$kendo-time-selector-lg-line-height: $kendo-list-line-height-lg !default; +$kendo-time-selector-lg-list-item-padding-x: $kendo-list-item-padding-x-lg !default; +$kendo-time-selector-lg-list-item-padding-y: $kendo-list-item-padding-y-lg !default; + +$kendo-time-selector-sizes: ( + sm: ( + font-size: $kendo-time-selector-sm-font-size, + line-height: $kendo-time-selector-sm-line-height, + list-item-padding-x: $kendo-time-selector-sm-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-sm-list-item-padding-y + ), + md: ( + font-size: $kendo-time-selector-md-font-size, + line-height: $kendo-time-selector-md-line-height, + list-item-padding-x: $kendo-time-selector-md-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-md-list-item-padding-y + ), + lg: ( + font-size: $kendo-time-selector-lg-font-size, + line-height: $kendo-time-selector-lg-line-height, + list-item-padding-x: $kendo-time-selector-lg-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-lg-list-item-padding-y + ) +) !default; diff --git a/packages/default/scss/list/_variables.scss b/packages/default/scss/list/_variables.scss index a4ef1df011e..78e9a132dff 100644 --- a/packages/default/scss/list/_variables.scss +++ b/packages/default/scss/list/_variables.scss @@ -10,8 +10,8 @@ $kendo-list-font-size-lg: $font-size-lg !default; /// Line height of the list component, if no size is set. /// @group list $kendo-list-line-height: null !default; -$kendo-list-line-height-sm: null !default; -$kendo-list-line-height-md: null !default; +$kendo-list-line-height-sm: $line-height-md !default; +$kendo-list-line-height-md: $line-height-md !default; $kendo-list-line-height-lg: $line-height-lg !default; /// Horizontal padding of list header, if no size is set. diff --git a/packages/default/scss/timeselector/_layout.scss b/packages/default/scss/timeselector/_layout.scss index b12a776304a..89bae4ccb15 100644 --- a/packages/default/scss/timeselector/_layout.scss +++ b/packages/default/scss/timeselector/_layout.scss @@ -206,4 +206,34 @@ top: calc( #{$time-list-title-height / 2} ); } + + // Time selector sizes + @each $size, $size-props in $kendo-time-selector-sizes { + $_font-size: map-get( $size-props, font-size ); + $_line-height: map-get( $size-props, line-height ); + $_list-item-padding-x: map-get( $size-props, list-item-padding-x ); + $_list-item-padding-y: map-get( $size-props, list-item-padding-y ); + $_highlight-height: calc( #{$_font-size * $_line-height} + #{ $_list-item-padding-y * 2} ); + + + .k-timeselector-#{$size} { + font-size: $_font-size; + line-height: $_line-height; + + .k-time-highlight, + .k-time-list-highlight { + height: $_highlight-height; + } + + .k-time-separator { + height: $_highlight-height; + } + + .k-time-list-item, + .k-time-list .k-item { + padding: $_list-item-padding-y $_list-item-padding-x; + } + } + } + } diff --git a/packages/default/scss/timeselector/_variables.scss b/packages/default/scss/timeselector/_variables.scss index 6da99b37a56..679a4ba4b5e 100644 --- a/packages/default/scss/timeselector/_variables.scss +++ b/packages/default/scss/timeselector/_variables.scss @@ -30,3 +30,41 @@ $time-list-highlight-bg: $component-bg !default; $time-list-highlight-border: $component-border !default; $time-list-focused-bg: rgba(0, 0, 0, .04) !default; + + +// Time selector sizes +$kendo-time-selector-sm-font-size: $kendo-list-font-size-sm !default; +$kendo-time-selector-sm-line-height: $kendo-list-line-height-sm !default; +$kendo-time-selector-sm-list-item-padding-x: $kendo-list-item-padding-x-sm !default; +$kendo-time-selector-sm-list-item-padding-y: $kendo-list-item-padding-y-sm !default; + +$kendo-time-selector-md-font-size: $kendo-list-font-size-md !default; +$kendo-time-selector-md-line-height: $kendo-list-line-height-md !default; +$kendo-time-selector-md-list-item-padding-x: $kendo-list-item-padding-x-md !default; +$kendo-time-selector-md-list-item-padding-y: $kendo-list-item-padding-y-md !default; + +$kendo-time-selector-lg-font-size: $kendo-list-font-size-lg !default; +$kendo-time-selector-lg-line-height: $kendo-list-line-height-lg !default; +$kendo-time-selector-lg-list-item-padding-x: $kendo-list-item-padding-x-lg !default; +$kendo-time-selector-lg-list-item-padding-y: $kendo-list-item-padding-y-lg !default; + +$kendo-time-selector-sizes: ( + sm: ( + font-size: $kendo-time-selector-sm-font-size, + line-height: $kendo-time-selector-sm-line-height, + list-item-padding-x: $kendo-time-selector-sm-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-sm-list-item-padding-y + ), + md: ( + font-size: $kendo-time-selector-md-font-size, + line-height: $kendo-time-selector-md-line-height, + list-item-padding-x: $kendo-time-selector-md-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-md-list-item-padding-y + ), + lg: ( + font-size: $kendo-time-selector-lg-font-size, + line-height: $kendo-time-selector-lg-line-height, + list-item-padding-x: $kendo-time-selector-lg-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-lg-list-item-padding-y + ) +) !default; diff --git a/packages/material/scss/timeselector/_variables.scss b/packages/material/scss/timeselector/_variables.scss index 21c846dfe06..cb34a3eaf4c 100644 --- a/packages/material/scss/timeselector/_variables.scss +++ b/packages/material/scss/timeselector/_variables.scss @@ -30,3 +30,41 @@ $time-list-highlight-bg: $component-bg !default; $time-list-highlight-border: $component-border !default; $time-list-focused-bg: null !default; + + +// Time selector sizes +$kendo-time-selector-sm-font-size: $kendo-list-font-size-sm !default; +$kendo-time-selector-sm-line-height: $kendo-list-line-height-sm !default; +$kendo-time-selector-sm-list-item-padding-x: $kendo-list-item-padding-x-sm !default; +$kendo-time-selector-sm-list-item-padding-y: $kendo-list-item-padding-y-sm !default; + +$kendo-time-selector-md-font-size: $kendo-list-font-size-md !default; +$kendo-time-selector-md-line-height: $kendo-list-line-height-md !default; +$kendo-time-selector-md-list-item-padding-x: $kendo-list-item-padding-x-md !default; +$kendo-time-selector-md-list-item-padding-y: $kendo-list-item-padding-y-md !default; + +$kendo-time-selector-lg-font-size: $kendo-list-font-size-lg !default; +$kendo-time-selector-lg-line-height: $kendo-list-line-height-lg !default; +$kendo-time-selector-lg-list-item-padding-x: $kendo-list-item-padding-x-lg !default; +$kendo-time-selector-lg-list-item-padding-y: $kendo-list-item-padding-y-lg !default; + +$kendo-time-selector-sizes: ( + sm: ( + font-size: $kendo-time-selector-sm-font-size, + line-height: $kendo-time-selector-sm-line-height, + list-item-padding-x: $kendo-time-selector-sm-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-sm-list-item-padding-y + ), + md: ( + font-size: $kendo-time-selector-md-font-size, + line-height: $kendo-time-selector-md-line-height, + list-item-padding-x: $kendo-time-selector-md-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-md-list-item-padding-y + ), + lg: ( + font-size: $kendo-time-selector-lg-font-size, + line-height: $kendo-time-selector-lg-line-height, + list-item-padding-x: $kendo-time-selector-lg-list-item-padding-x, + list-item-padding-y: $kendo-time-selector-lg-list-item-padding-y + ) +) !default;