From d567a72fec402302c950542c7dcb8b78261d3285 Mon Sep 17 00:00:00 2001 From: joneff Date: Fri, 10 Dec 2021 01:07:40 +0200 Subject: [PATCH] fix(popup): make padding of popups 0 --- packages/bootstrap/scss/menu/_variables.scss | 4 ++-- packages/bootstrap/scss/popup/_variables.scss | 4 ++-- packages/classic/scss/menu/_variables.scss | 4 ++-- packages/classic/scss/popup/_variables.scss | 4 ++-- packages/default/scss/menu/_layout.scss | 10 ++++------ packages/default/scss/menu/_variables.scss | 4 ++-- packages/default/scss/popup/_layout.scss | 3 ++- packages/default/scss/popup/_variables.scss | 4 ++-- packages/default/scss/spreadsheet/_layout.scss | 3 --- packages/material/scss/menu/_variables.scss | 4 ++-- packages/material/scss/popup/_variables.scss | 4 ++-- 11 files changed, 22 insertions(+), 26 deletions(-) diff --git a/packages/bootstrap/scss/menu/_variables.scss b/packages/bootstrap/scss/menu/_variables.scss index 5d1f0e3447c..5d5440198c1 100644 --- a/packages/bootstrap/scss/menu/_variables.scss +++ b/packages/bootstrap/scss/menu/_variables.scss @@ -45,8 +45,8 @@ $menu-scroll-button-hover-gradient: null !default; // Menu popup -$menu-popup-padding-x: $popup-padding-x !default; -$menu-popup-padding-y: $popup-padding-y !default; +$menu-popup-padding-x: null !default; +$menu-popup-padding-y: null !default; $menu-popup-border-width: $popup-border-width !default; $menu-popup-font-size: $font-size !default; $menu-popup-line-height: $line-height !default; diff --git a/packages/bootstrap/scss/popup/_variables.scss b/packages/bootstrap/scss/popup/_variables.scss index 442483ccd47..8c220d9a6ce 100644 --- a/packages/bootstrap/scss/popup/_variables.scss +++ b/packages/bootstrap/scss/popup/_variables.scss @@ -1,6 +1,6 @@ // Popup -$popup-padding-x: 0px !default; -$popup-padding-y: 8px !default; +$popup-padding-x: null !default; +$popup-padding-y: null !default; $popup-border-width: 1px !default; $popup-border-radius: $border-radius !default; diff --git a/packages/classic/scss/menu/_variables.scss b/packages/classic/scss/menu/_variables.scss index 28d6bf79987..807ebe222ec 100644 --- a/packages/classic/scss/menu/_variables.scss +++ b/packages/classic/scss/menu/_variables.scss @@ -47,8 +47,8 @@ $menu-scroll-button-hover-gradient: null !default; // Menu popup -$menu-popup-padding-x: $popup-padding-x !default; -$menu-popup-padding-y: $popup-padding-y !default; +$menu-popup-padding-x: null !default; +$menu-popup-padding-y: null !default; $menu-popup-border-width: $popup-border-width !default; $menu-popup-font-size: $font-size !default; $menu-popup-line-height: $line-height !default; diff --git a/packages/classic/scss/popup/_variables.scss b/packages/classic/scss/popup/_variables.scss index a933497daae..1a492b47049 100644 --- a/packages/classic/scss/popup/_variables.scss +++ b/packages/classic/scss/popup/_variables.scss @@ -1,6 +1,6 @@ // Popup -$popup-padding-x: 0px !default; -$popup-padding-y: 0px !default; +$popup-padding-x: null !default; +$popup-padding-y: null !default; $popup-border-width: 1px !default; $popup-border-radius: null !default; diff --git a/packages/default/scss/menu/_layout.scss b/packages/default/scss/menu/_layout.scss index fdefe572c06..bd27d1af970 100644 --- a/packages/default/scss/menu/_layout.scss +++ b/packages/default/scss/menu/_layout.scss @@ -126,7 +126,8 @@ // Sub menu .k-menu-group { margin: 0; - padding: $menu-popup-padding-y $menu-popup-padding-x; + padding: 0; + // padding: $menu-popup-padding-y $menu-popup-padding-x; font-size: $menu-popup-font-size; line-height: $menu-popup-line-height; list-style: none; @@ -174,13 +175,10 @@ } .k-context-menu { margin: 0; - padding: $menu-popup-padding-y $menu-popup-padding-x; + padding: 0; + // padding: $menu-popup-padding-y $menu-popup-padding-x; border-width: $menu-popup-border-width; border-style: solid; - - &.k-menu-horizontal { - padding: $menu-popup-padding-x $menu-popup-padding-y; - } } .k-animation-container .k-context-menu.k-menu-horizontal { // kendo-jquery adds `display: block` via js and we need to override it. diff --git a/packages/default/scss/menu/_variables.scss b/packages/default/scss/menu/_variables.scss index 1ff66b561fd..48ff52d8418 100644 --- a/packages/default/scss/menu/_variables.scss +++ b/packages/default/scss/menu/_variables.scss @@ -47,8 +47,8 @@ $menu-scroll-button-hover-gradient: null !default; // Menu popup -$menu-popup-padding-x: $popup-padding-x !default; -$menu-popup-padding-y: $popup-padding-y !default; +$menu-popup-padding-x: null !default; +$menu-popup-padding-y: null !default; $menu-popup-border-width: $popup-border-width !default; $menu-popup-font-size: $font-size !default; $menu-popup-line-height: $line-height !default; diff --git a/packages/default/scss/popup/_layout.scss b/packages/default/scss/popup/_layout.scss index f5249374c9f..7c523eb64d4 100644 --- a/packages/default/scss/popup/_layout.scss +++ b/packages/default/scss/popup/_layout.scss @@ -3,7 +3,8 @@ .k-popup { @include border-radius( $popup-border-radius ); margin: 0; - padding: $popup-padding-y $popup-padding-x; + padding: 0; + // padding: $popup-padding-y $popup-padding-x; border-width: $popup-border-width; border-style: solid; box-sizing: border-box; diff --git a/packages/default/scss/popup/_variables.scss b/packages/default/scss/popup/_variables.scss index a933497daae..1a492b47049 100644 --- a/packages/default/scss/popup/_variables.scss +++ b/packages/default/scss/popup/_variables.scss @@ -1,6 +1,6 @@ // Popup -$popup-padding-x: 0px !default; -$popup-padding-y: 0px !default; +$popup-padding-x: null !default; +$popup-padding-y: null !default; $popup-border-width: 1px !default; $popup-border-radius: null !default; diff --git a/packages/default/scss/spreadsheet/_layout.scss b/packages/default/scss/spreadsheet/_layout.scss index 0de8ee1ab0a..d4e8f1824d2 100644 --- a/packages/default/scss/spreadsheet/_layout.scss +++ b/packages/default/scss/spreadsheet/_layout.scss @@ -701,9 +701,6 @@ } .k-reset-color { border-bottom-width: 1px; } .k-custom-color { border-top-width: 1px; } - .k-spreadsheet-color-palette { - padding: $popup-padding-y; - } .k-spreadsheet-border-type-palette { width: 12.5rem; height: 5rem; diff --git a/packages/material/scss/menu/_variables.scss b/packages/material/scss/menu/_variables.scss index df6a3f570ef..5e713321880 100644 --- a/packages/material/scss/menu/_variables.scss +++ b/packages/material/scss/menu/_variables.scss @@ -47,8 +47,8 @@ $menu-scroll-button-hover-gradient: null !default; // Menu popup -$menu-popup-padding-x: $popup-padding-x !default; -$menu-popup-padding-y: $popup-padding-y !default; +$menu-popup-padding-x: null !default; +$menu-popup-padding-y: null !default; $menu-popup-border-width: $popup-border-width !default; $menu-popup-font-size: $font-size !default; $menu-popup-line-height: $line-height !default; diff --git a/packages/material/scss/popup/_variables.scss b/packages/material/scss/popup/_variables.scss index 11554449c96..7c97164851f 100644 --- a/packages/material/scss/popup/_variables.scss +++ b/packages/material/scss/popup/_variables.scss @@ -1,6 +1,6 @@ // Popup -$popup-padding-x: 0px !default; -$popup-padding-y: 0px !default; +$popup-padding-x: null !default; +$popup-padding-y: null !default; $popup-border-width: 0px !default; $popup-border-radius: null !default;