From e02cc10d472cfba7e400a0f6083fe3cfad809841 Mon Sep 17 00:00:00 2001 From: Iliyana Dyankova Date: Thu, 17 Oct 2024 10:35:00 +0300 Subject: [PATCH] chore: migrate component styles --- packages/bootstrap/scss/_variables.scss | 16 + .../bootstrap/scss/action-buttons/_index.scss | 5 +- .../scss/action-buttons/_layout.scss | 3 +- .../bootstrap/scss/action-buttons/_theme.scss | 3 +- .../scss/action-buttons/_variables.scss | 14 +- .../bootstrap/scss/action-sheet/_index.scss | 6 +- .../bootstrap/scss/action-sheet/_layout.scss | 4 +- .../bootstrap/scss/action-sheet/_theme.scss | 3 +- .../scss/action-sheet/_variables.scss | 68 +- packages/bootstrap/scss/adaptive/_index.scss | 10 +- packages/bootstrap/scss/adaptive/_layout.scss | 6 +- packages/bootstrap/scss/adaptive/_theme.scss | 3 +- .../bootstrap/scss/adaptive/_variables.scss | 23 +- packages/bootstrap/scss/appbar/_index.scss | 3 +- packages/bootstrap/scss/appbar/_layout.scss | 4 +- packages/bootstrap/scss/appbar/_theme.scss | 3 +- .../bootstrap/scss/appbar/_variables.scss | 21 +- .../bootstrap/scss/autocomplete/_index.scss | 9 +- .../bootstrap/scss/autocomplete/_layout.scss | 4 +- .../bootstrap/scss/autocomplete/_theme.scss | 3 +- packages/bootstrap/scss/avatar/_index.scss | 3 +- packages/bootstrap/scss/avatar/_layout.scss | 3 +- packages/bootstrap/scss/avatar/_theme.scss | 3 +- .../bootstrap/scss/avatar/_variables.scss | 10 + packages/bootstrap/scss/badge/_index.scss | 3 + packages/bootstrap/scss/badge/_layout.scss | 2 + packages/bootstrap/scss/badge/_theme.scss | 1 + packages/bootstrap/scss/badge/_variables.scss | 27 + .../scss/bottom-navigation/_index.scss | 4 +- .../scss/bottom-navigation/_layout.scss | 4 +- .../scss/bottom-navigation/_theme.scss | 3 +- .../scss/bottom-navigation/_variables.scss | 26 +- .../bootstrap/scss/breadcrumb/_index.scss | 6 +- .../bootstrap/scss/breadcrumb/_layout.scss | 5 +- .../bootstrap/scss/breadcrumb/_theme.scss | 3 +- .../bootstrap/scss/breadcrumb/_variables.scss | 66 +- .../bootstrap/scss/button/_variables.scss | 6 +- packages/bootstrap/scss/calendar/_index.scss | 6 +- packages/bootstrap/scss/calendar/_layout.scss | 2 +- packages/bootstrap/scss/calendar/_theme.scss | 3 +- .../bootstrap/scss/calendar/_variables.scss | 101 +++ packages/bootstrap/scss/captcha/_index.scss | 9 +- packages/bootstrap/scss/captcha/_layout.scss | 4 +- packages/bootstrap/scss/captcha/_theme.scss | 2 +- .../bootstrap/scss/captcha/_variables.scss | 18 + packages/bootstrap/scss/card/_index.scss | 7 +- packages/bootstrap/scss/card/_layout.scss | 5 +- packages/bootstrap/scss/card/_theme.scss | 3 +- packages/bootstrap/scss/card/_variables.scss | 61 ++ .../bootstrap/scss/chart-wizard/_index.scss | 13 +- .../bootstrap/scss/chart-wizard/_layout.scss | 2 +- .../bootstrap/scss/chart-wizard/_theme.scss | 2 +- .../scss/chart-wizard/_variables.scss | 15 + packages/bootstrap/scss/chat/_index.scss | 7 +- packages/bootstrap/scss/chat/_layout.scss | 2 +- packages/bootstrap/scss/chat/_theme.scss | 2 +- packages/bootstrap/scss/chat/_variables.scss | 69 ++ packages/bootstrap/scss/checkbox/_index.scss | 3 +- packages/bootstrap/scss/checkbox/_layout.scss | 2 +- packages/bootstrap/scss/checkbox/_theme.scss | 2 +- .../bootstrap/scss/checkbox/_variables.scss | 52 ++ packages/bootstrap/scss/chip/_index.scss | 4 +- packages/bootstrap/scss/chip/_layout.scss | 2 +- packages/bootstrap/scss/chip/_theme.scss | 2 +- packages/bootstrap/scss/chip/_variables.scss | 55 +- .../bootstrap/scss/color-preview/_index.scss | 7 +- .../bootstrap/scss/color-preview/_layout.scss | 2 +- .../bootstrap/scss/color-preview/_theme.scss | 2 +- .../scss/color-preview/_variables.scss | 15 + .../bootstrap/scss/coloreditor/_index.scss | 29 +- .../bootstrap/scss/coloreditor/_layout.scss | 2 +- .../bootstrap/scss/coloreditor/_theme.scss | 2 +- .../scss/coloreditor/_variables.scss | 28 + .../bootstrap/scss/colorgradient/_index.scss | 8 +- .../bootstrap/scss/colorgradient/_layout.scss | 2 +- .../bootstrap/scss/colorgradient/_theme.scss | 2 +- .../scss/colorgradient/_variables.scss | 50 +- .../bootstrap/scss/colorpalette/_index.scss | 3 +- .../bootstrap/scss/colorpalette/_layout.scss | 2 +- .../bootstrap/scss/colorpalette/_theme.scss | 2 +- .../scss/colorpalette/_variables.scss | 12 + .../bootstrap/scss/colorpicker/_index.scss | 10 +- .../bootstrap/scss/colorpicker/_layout.scss | 2 +- .../bootstrap/scss/colorpicker/_theme.scss | 2 +- packages/bootstrap/scss/combobox/_index.scss | 20 +- packages/bootstrap/scss/combobox/_layout.scss | 2 +- packages/bootstrap/scss/combobox/_theme.scss | 2 +- packages/bootstrap/scss/core/_index.scss | 52 +- packages/bootstrap/scss/dataviz/_index.scss | 3 + packages/bootstrap/scss/dataviz/_layout.scss | 4 +- packages/bootstrap/scss/dataviz/_theme.scss | 2 +- .../bootstrap/scss/dataviz/_variables.scss | 109 ++- packages/bootstrap/scss/dateinput/_index.scss | 6 +- .../bootstrap/scss/dateinput/_layout.scss | 4 +- packages/bootstrap/scss/dateinput/_theme.scss | 4 +- .../bootstrap/scss/datepicker/_index.scss | 8 +- .../bootstrap/scss/datepicker/_layout.scss | 4 +- .../bootstrap/scss/datepicker/_theme.scss | 4 +- .../scss/daterangepicker/_index.scss | 14 +- .../scss/daterangepicker/_layout.scss | 4 +- .../scss/daterangepicker/_theme.scss | 4 +- .../scss/daterangepicker/_variables.scss | 5 + .../bootstrap/scss/datetimepicker/_index.scss | 16 +- .../scss/datetimepicker/_layout.scss | 4 +- .../bootstrap/scss/datetimepicker/_theme.scss | 4 +- .../scss/datetimepicker/_variables.scss | 5 + packages/bootstrap/scss/dialog/_index.scss | 4 +- packages/bootstrap/scss/dialog/_layout.scss | 2 +- packages/bootstrap/scss/dialog/_theme.scss | 2 +- .../bootstrap/scss/dialog/_variables.scss | 18 +- .../bootstrap/scss/dock-manager/_index.scss | 12 +- .../bootstrap/scss/dock-manager/_layout.scss | 2 +- .../bootstrap/scss/dock-manager/_theme.scss | 2 +- .../scss/dock-manager/_variables.scss | 39 + packages/bootstrap/scss/draggable/_index.scss | 3 +- .../bootstrap/scss/draggable/_layout.scss | 2 +- packages/bootstrap/scss/draggable/_theme.scss | 2 +- .../bootstrap/scss/draggable/_variables.scss | 27 +- packages/bootstrap/scss/drawer/_index.scss | 6 +- packages/bootstrap/scss/drawer/_layout.scss | 2 +- packages/bootstrap/scss/drawer/_theme.scss | 2 +- .../bootstrap/scss/drawer/_variables.scss | 42 +- .../bootstrap/scss/dropdowngrid/_index.scss | 14 +- .../bootstrap/scss/dropdowngrid/_layout.scss | 2 +- .../bootstrap/scss/dropdowngrid/_theme.scss | 4 +- .../bootstrap/scss/dropdownlist/_index.scss | 15 +- .../bootstrap/scss/dropdownlist/_layout.scss | 4 +- .../bootstrap/scss/dropdownlist/_theme.scss | 4 +- .../bootstrap/scss/dropdowntree/_index.scss | 14 +- .../bootstrap/scss/dropdowntree/_layout.scss | 4 +- .../bootstrap/scss/dropdowntree/_theme.scss | 4 +- .../scss/dropdowntree/_variables.scss | 6 + packages/bootstrap/scss/dropzone/_index.scss | 4 +- packages/bootstrap/scss/dropzone/_layout.scss | 2 +- packages/bootstrap/scss/dropzone/_theme.scss | 2 +- .../bootstrap/scss/dropzone/_variables.scss | 23 + packages/bootstrap/scss/editor/_index.scss | 12 +- packages/bootstrap/scss/editor/_layout.scss | 4 +- packages/bootstrap/scss/editor/_theme.scss | 2 +- .../bootstrap/scss/editor/_variables.scss | 20 + .../scss/expansion-panel/_index.scss | 11 +- .../scss/expansion-panel/_layout.scss | 4 +- .../scss/expansion-panel/_theme.scss | 4 +- .../scss/expansion-panel/_variables.scss | 26 + packages/bootstrap/scss/fab/_index.scss | 7 +- packages/bootstrap/scss/fab/_layout.scss | 2 +- packages/bootstrap/scss/fab/_theme.scss | 2 +- packages/bootstrap/scss/fab/_variables.scss | 51 ++ .../bootstrap/scss/filemanager/_index.scss | 17 +- .../bootstrap/scss/filemanager/_layout.scss | 2 +- .../bootstrap/scss/filemanager/_theme.scss | 2 +- .../scss/filemanager/_variables.scss | 61 ++ packages/bootstrap/scss/filter/_index.scss | 11 +- packages/bootstrap/scss/filter/_layout.scss | 2 +- packages/bootstrap/scss/filter/_theme.scss | 2 +- .../bootstrap/scss/filter/_variables.scss | 18 +- .../bootstrap/scss/floating-label/_index.scss | 5 +- .../scss/floating-label/_layout.scss | 2 +- .../bootstrap/scss/floating-label/_theme.scss | 2 +- .../scss/floating-label/_variables.scss | 19 + packages/bootstrap/scss/forms/_index.scss | 14 +- packages/bootstrap/scss/forms/_layout.scss | 14 +- packages/bootstrap/scss/forms/_theme.scss | 2 +- packages/bootstrap/scss/forms/_variables.scss | 54 +- packages/bootstrap/scss/gantt/_index.scss | 12 +- packages/bootstrap/scss/gantt/_layout.scss | 4 +- packages/bootstrap/scss/gantt/_theme.scss | 2 +- packages/bootstrap/scss/gantt/_variables.scss | 78 +- packages/bootstrap/scss/grid/_index.scss | 25 +- packages/bootstrap/scss/grid/_layout.scss | 2 +- packages/bootstrap/scss/grid/_theme.scss | 6 +- packages/bootstrap/scss/grid/_variables.scss | 158 ++++- packages/bootstrap/scss/icon/_layout.scss | 2 +- packages/bootstrap/scss/icon/_theme.scss | 2 +- packages/bootstrap/scss/icon/_variables.scss | 18 +- packages/bootstrap/scss/icons/_index.scss | 1 + packages/bootstrap/scss/icons/_variables.scss | 22 +- .../bootstrap/scss/imageeditor/_index.scss | 10 +- .../bootstrap/scss/imageeditor/_layout.scss | 2 +- .../bootstrap/scss/imageeditor/_theme.scss | 2 +- .../scss/imageeditor/_variables.scss | 35 + packages/bootstrap/scss/index.scss | 667 +++++++++--------- packages/bootstrap/scss/input/_index.scss | 5 +- packages/bootstrap/scss/input/_layout.scss | 2 +- packages/bootstrap/scss/input/_theme.scss | 2 +- packages/bootstrap/scss/input/_variables.scss | 130 ++++ packages/bootstrap/scss/list/_index.scss | 14 +- packages/bootstrap/scss/list/_layout.scss | 4 +- packages/bootstrap/scss/list/_theme.scss | 2 +- packages/bootstrap/scss/list/_variables.scss | 89 ++- packages/bootstrap/scss/listbox/_index.scss | 8 +- packages/bootstrap/scss/listbox/_layout.scss | 2 +- packages/bootstrap/scss/listbox/_theme.scss | 2 +- .../bootstrap/scss/listbox/_variables.scss | 19 + packages/bootstrap/scss/listgroup/_index.scss | 5 +- .../bootstrap/scss/listgroup/_layout.scss | 2 +- packages/bootstrap/scss/listgroup/_theme.scss | 2 +- .../bootstrap/scss/listgroup/_variables.scss | 14 + packages/bootstrap/scss/listview/_index.scss | 6 +- packages/bootstrap/scss/listview/_layout.scss | 2 +- packages/bootstrap/scss/listview/_theme.scss | 2 +- .../bootstrap/scss/listview/_variables.scss | 22 + packages/bootstrap/scss/loader/_index.scss | 5 +- packages/bootstrap/scss/loader/_layout.scss | 2 +- packages/bootstrap/scss/loader/_theme.scss | 2 +- .../bootstrap/scss/loader/_variables.scss | 41 ++ packages/bootstrap/scss/map/_index.scss | 6 +- packages/bootstrap/scss/map/_layout.scss | 2 +- packages/bootstrap/scss/map/_theme.scss | 2 +- packages/bootstrap/scss/map/_variables.scss | 34 +- .../bootstrap/scss/maskedtextbox/_index.scss | 13 +- .../bootstrap/scss/maskedtextbox/_layout.scss | 2 +- .../bootstrap/scss/maskedtextbox/_theme.scss | 2 +- .../bootstrap/scss/mediaplayer/_index.scss | 8 +- .../bootstrap/scss/mediaplayer/_layout.scss | 2 +- .../bootstrap/scss/mediaplayer/_theme.scss | 2 +- .../scss/mediaplayer/_variables.scss | 17 + .../bootstrap/scss/menu-button/_index.scss | 5 +- .../bootstrap/scss/menu-button/_layout.scss | 2 +- .../bootstrap/scss/menu-button/_theme.scss | 2 +- .../scss/menu-button/_variables.scss | 5 + packages/bootstrap/scss/menu/_index.scss | 7 +- packages/bootstrap/scss/menu/_layout.scss | 6 +- packages/bootstrap/scss/menu/_theme.scss | 2 +- packages/bootstrap/scss/menu/_variables.scss | 96 ++- .../bootstrap/scss/messagebox/_index.scss | 5 +- .../bootstrap/scss/messagebox/_layout.scss | 2 +- .../bootstrap/scss/messagebox/_theme.scss | 2 +- .../bootstrap/scss/messagebox/_variables.scss | 21 +- .../bootstrap/scss/multiselect/_index.scss | 12 +- .../bootstrap/scss/multiselect/_layout.scss | 2 +- .../bootstrap/scss/multiselect/_theme.scss | 2 +- packages/bootstrap/scss/no-data/_layout.scss | 2 +- packages/bootstrap/scss/no-data/_theme.scss | 2 +- .../bootstrap/scss/no-data/_variables.scss | 6 + .../scss/notification/_functions.scss | 17 + .../bootstrap/scss/notification/_index.scss | 7 +- .../bootstrap/scss/notification/_layout.scss | 2 +- .../bootstrap/scss/notification/_theme.scss | 2 +- .../scss/notification/_variables.scss | 35 +- .../bootstrap/scss/numerictextbox/_index.scss | 15 +- .../scss/numerictextbox/_layout.scss | 2 +- .../bootstrap/scss/numerictextbox/_theme.scss | 2 +- packages/bootstrap/scss/orgchart/_index.scss | 13 +- packages/bootstrap/scss/orgchart/_layout.scss | 2 +- packages/bootstrap/scss/orgchart/_theme.scss | 2 +- .../bootstrap/scss/orgchart/_variables.scss | 48 ++ packages/bootstrap/scss/overlay/_index.scss | 5 +- packages/bootstrap/scss/overlay/_layout.scss | 2 +- packages/bootstrap/scss/overlay/_theme.scss | 2 +- .../bootstrap/scss/overlay/_variables.scss | 7 + packages/bootstrap/scss/pager/_index.scss | 8 +- packages/bootstrap/scss/pager/_layout.scss | 2 +- packages/bootstrap/scss/pager/_theme.scss | 2 +- packages/bootstrap/scss/pager/_variables.scss | 49 ++ packages/bootstrap/scss/panel/_index.scss | 8 +- packages/bootstrap/scss/panel/_layout.scss | 2 +- packages/bootstrap/scss/panel/_theme.scss | 2 +- packages/bootstrap/scss/panel/_variables.scss | 35 +- packages/bootstrap/scss/panelbar/_index.scss | 7 +- packages/bootstrap/scss/panelbar/_layout.scss | 2 +- packages/bootstrap/scss/panelbar/_theme.scss | 2 +- .../bootstrap/scss/panelbar/_variables.scss | 87 +++ .../bootstrap/scss/pdf-viewer/_index.scss | 12 +- .../bootstrap/scss/pdf-viewer/_layout.scss | 2 +- .../bootstrap/scss/pdf-viewer/_theme.scss | 2 +- .../bootstrap/scss/pdf-viewer/_variables.scss | 48 +- packages/bootstrap/scss/pivotgrid/_index.scss | 10 +- .../bootstrap/scss/pivotgrid/_layout.scss | 2 +- packages/bootstrap/scss/pivotgrid/_theme.scss | 2 +- .../bootstrap/scss/pivotgrid/_variables.scss | 91 +++ packages/bootstrap/scss/popover/_index.scss | 9 +- packages/bootstrap/scss/popover/_layout.scss | 2 +- packages/bootstrap/scss/popover/_theme.scss | 2 +- .../bootstrap/scss/popover/_variables.scss | 30 + packages/bootstrap/scss/popup/_index.scss | 5 +- packages/bootstrap/scss/popup/_layout.scss | 2 +- packages/bootstrap/scss/popup/_theme.scss | 2 +- packages/bootstrap/scss/popup/_variables.scss | 16 + .../bootstrap/scss/progressbar/_index.scss | 5 +- .../bootstrap/scss/progressbar/_layout.scss | 2 +- .../bootstrap/scss/progressbar/_theme.scss | 2 +- .../scss/progressbar/_variables.scss | 27 + packages/bootstrap/scss/prompt/_index.scss | 5 +- packages/bootstrap/scss/prompt/_layout.scss | 2 +- packages/bootstrap/scss/prompt/_theme.scss | 2 +- .../bootstrap/scss/prompt/_variables.scss | 24 + packages/bootstrap/scss/radio/_index.scss | 5 +- packages/bootstrap/scss/radio/_layout.scss | 2 +- packages/bootstrap/scss/radio/_theme.scss | 2 +- packages/bootstrap/scss/radio/_variables.scss | 49 ++ packages/bootstrap/scss/rating/_index.scss | 6 +- packages/bootstrap/scss/rating/_layout.scss | 2 +- packages/bootstrap/scss/rating/_theme.scss | 2 +- .../bootstrap/scss/rating/_variables.scss | 31 +- .../scss/responsivepanel/_index.scss | 12 +- .../scss/responsivepanel/_layout.scss | 2 +- .../scss/responsivepanel/_theme.scss | 2 +- packages/bootstrap/scss/ripple/_index.scss | 5 +- packages/bootstrap/scss/ripple/_layout.scss | 2 +- packages/bootstrap/scss/ripple/_theme.scss | 2 +- packages/bootstrap/scss/scheduler/_index.scss | 12 +- .../bootstrap/scss/scheduler/_layout.scss | 12 +- packages/bootstrap/scss/scheduler/_theme.scss | 2 +- .../bootstrap/scss/scheduler/_variables.scss | 79 ++- packages/bootstrap/scss/scroller/_index.scss | 6 +- packages/bootstrap/scss/scroller/_layout.scss | 2 +- packages/bootstrap/scss/scroller/_theme.scss | 2 +- .../bootstrap/scss/scrollview/_index.scss | 7 +- .../bootstrap/scss/scrollview/_layout.scss | 2 +- .../bootstrap/scss/scrollview/_theme.scss | 2 +- .../bootstrap/scss/scrollview/_variables.scss | 32 + packages/bootstrap/scss/searchbox/_index.scss | 8 +- .../bootstrap/scss/searchbox/_layout.scss | 2 +- packages/bootstrap/scss/searchbox/_theme.scss | 2 +- packages/bootstrap/scss/signature/_index.scss | 7 +- .../bootstrap/scss/signature/_layout.scss | 2 +- packages/bootstrap/scss/signature/_theme.scss | 2 +- .../bootstrap/scss/signature/_variables.scss | 28 + packages/bootstrap/scss/skeleton/_index.scss | 5 +- packages/bootstrap/scss/skeleton/_layout.scss | 2 +- packages/bootstrap/scss/skeleton/_theme.scss | 2 +- .../bootstrap/scss/skeleton/_variables.scss | 10 + packages/bootstrap/scss/slider/_index.scss | 8 +- packages/bootstrap/scss/slider/_layout.scss | 2 +- packages/bootstrap/scss/slider/_theme.scss | 2 +- .../bootstrap/scss/slider/_variables.scss | 42 ++ .../bootstrap/scss/split-button/_index.scss | 7 +- .../bootstrap/scss/split-button/_layout.scss | 2 +- .../bootstrap/scss/split-button/_theme.scss | 2 +- .../scss/split-button/_variables.scss | 13 + packages/bootstrap/scss/splitter/_index.scss | 6 +- packages/bootstrap/scss/splitter/_layout.scss | 2 +- packages/bootstrap/scss/splitter/_theme.scss | 2 +- .../bootstrap/scss/splitter/_variables.scss | 23 + .../bootstrap/scss/spreadsheet/_index.scss | 20 +- .../bootstrap/scss/spreadsheet/_layout.scss | 5 +- .../bootstrap/scss/spreadsheet/_theme.scss | 2 +- .../scss/spreadsheet/_variables.scss | 83 +++ packages/bootstrap/scss/stepper/_index.scss | 7 +- packages/bootstrap/scss/stepper/_layout.scss | 2 +- packages/bootstrap/scss/stepper/_theme.scss | 2 +- .../bootstrap/scss/stepper/_variables.scss | 73 ++ packages/bootstrap/scss/switch/_index.scss | 5 +- packages/bootstrap/scss/switch/_layout.scss | 2 +- packages/bootstrap/scss/switch/_theme.scss | 2 +- .../bootstrap/scss/switch/_variables.scss | 60 ++ packages/bootstrap/scss/table/_index.scss | 5 +- packages/bootstrap/scss/table/_layout.scss | 2 +- packages/bootstrap/scss/table/_theme.scss | 2 +- packages/bootstrap/scss/table/_variables.scss | 49 +- packages/bootstrap/scss/tabstrip/_index.scss | 8 +- packages/bootstrap/scss/tabstrip/_layout.scss | 2 +- packages/bootstrap/scss/tabstrip/_theme.scss | 2 +- .../bootstrap/scss/tabstrip/_variables.scss | 54 +- packages/bootstrap/scss/taskboard/_index.scss | 18 +- .../bootstrap/scss/taskboard/_layout.scss | 2 +- packages/bootstrap/scss/taskboard/_theme.scss | 2 +- .../bootstrap/scss/taskboard/_variables.scss | 79 +++ packages/bootstrap/scss/textarea/_index.scss | 7 +- packages/bootstrap/scss/textarea/_layout.scss | 2 +- packages/bootstrap/scss/textarea/_theme.scss | 2 +- packages/bootstrap/scss/textbox/_index.scss | 7 +- packages/bootstrap/scss/textbox/_layout.scss | 2 +- packages/bootstrap/scss/textbox/_theme.scss | 2 +- .../bootstrap/scss/tilelayout/_index.scss | 9 +- .../bootstrap/scss/tilelayout/_layout.scss | 2 +- .../bootstrap/scss/tilelayout/_theme.scss | 2 +- .../bootstrap/scss/tilelayout/_variables.scss | 14 + .../bootstrap/scss/time-marker/_index.scss | 5 +- .../bootstrap/scss/time-marker/_layout.scss | 2 +- .../bootstrap/scss/time-marker/_theme.scss | 2 +- .../scss/time-marker/_variables.scss | 6 + .../scss/timedurationpicker/_index.scss | 17 +- .../scss/timedurationpicker/_layout.scss | 2 +- .../scss/timedurationpicker/_theme.scss | 2 +- packages/bootstrap/scss/timeline/_index.scss | 8 +- packages/bootstrap/scss/timeline/_layout.scss | 2 +- packages/bootstrap/scss/timeline/_theme.scss | 2 +- .../bootstrap/scss/timeline/_variables.scss | 64 +- .../bootstrap/scss/timepicker/_index.scss | 16 +- .../bootstrap/scss/timepicker/_layout.scss | 2 +- .../bootstrap/scss/timepicker/_theme.scss | 2 +- .../bootstrap/scss/timeselector/_index.scss | 14 +- .../bootstrap/scss/timeselector/_layout.scss | 2 +- .../bootstrap/scss/timeselector/_theme.scss | 2 +- .../scss/timeselector/_variables.scss | 41 ++ packages/bootstrap/scss/toolbar/_index.scss | 9 +- packages/bootstrap/scss/toolbar/_layout.scss | 2 +- packages/bootstrap/scss/toolbar/_theme.scss | 2 +- .../bootstrap/scss/toolbar/_variables.scss | 40 ++ .../bootstrap/scss/tooltip/_functions.scss | 17 + packages/bootstrap/scss/tooltip/_index.scss | 7 +- packages/bootstrap/scss/tooltip/_layout.scss | 2 +- packages/bootstrap/scss/tooltip/_theme.scss | 2 +- .../bootstrap/scss/tooltip/_variables.scss | 38 +- packages/bootstrap/scss/treelist/_index.scss | 7 +- packages/bootstrap/scss/treelist/_layout.scss | 2 +- packages/bootstrap/scss/treelist/_theme.scss | 2 +- .../bootstrap/scss/treelist/_variables.scss | 6 + packages/bootstrap/scss/treeview/_index.scss | 7 +- packages/bootstrap/scss/treeview/_layout.scss | 2 +- packages/bootstrap/scss/treeview/_theme.scss | 2 +- .../bootstrap/scss/treeview/_variables.scss | 53 ++ .../bootstrap/scss/typography/_index.scss | 5 +- .../bootstrap/scss/typography/_layout.scss | 2 +- .../bootstrap/scss/typography/_theme.scss | 2 +- .../bootstrap/scss/typography/_variables.scss | 81 +++ packages/bootstrap/scss/upload/_index.scss | 9 +- packages/bootstrap/scss/upload/_layout.scss | 4 +- packages/bootstrap/scss/upload/_theme.scss | 2 +- .../bootstrap/scss/upload/_variables.scss | 36 +- packages/bootstrap/scss/utils/_index.scss | 11 +- packages/bootstrap/scss/validator/_index.scss | 7 +- .../bootstrap/scss/validator/_layout.scss | 2 +- packages/bootstrap/scss/validator/_theme.scss | 2 +- .../scss/virtual-scroller/_index.scss | 4 +- .../scss/virtual-scroller/_layout.scss | 2 +- .../scss/virtual-scroller/_theme.scss | 2 +- packages/bootstrap/scss/window/_index.scss | 9 +- packages/bootstrap/scss/window/_layout.scss | 2 +- packages/bootstrap/scss/window/_theme.scss | 2 +- .../bootstrap/scss/window/_variables.scss | 44 +- packages/bootstrap/scss/wizard/_index.scss | 18 +- packages/bootstrap/scss/wizard/_layout.scss | 2 +- packages/bootstrap/scss/wizard/_theme.scss | 2 +- .../bootstrap/scss/wizard/_variables.scss | 22 +- 427 files changed, 5025 insertions(+), 960 deletions(-) create mode 100644 packages/bootstrap/scss/notification/_functions.scss create mode 100644 packages/bootstrap/scss/tooltip/_functions.scss diff --git a/packages/bootstrap/scss/_variables.scss b/packages/bootstrap/scss/_variables.scss index 1ec6725df55..7a196ea409b 100644 --- a/packages/bootstrap/scss/_variables.scss +++ b/packages/bootstrap/scss/_variables.scss @@ -38,3 +38,19 @@ $kendo-transition: color .2s ease-in-out, background-color .2s ease-in-out, bord // Generic styles // TODO: refactor once we extract drag drop as separate module + + +/* @forward "@progress/kendo-theme-default/scss/scss/_variables.scss" with ( + // $kendo-enable-shadows: $kendo-enable-shadows, + $kendo-enable-gradients: $kendo-enable-gradients, + $kendo-enable-transitions: $kendo-enable-transitions, + $kendo-enable-focus-contrast: $kendo-enable-focus-contrast, + $kendo-enable-typography: $kendo-enable-typography, + $kendo-use-input-button-width: $kendo-use-input-button-width, + $kendo-use-input-spinner-width: $kendo-use-input-spinner-width, + $kendo-use-input-spinner-icon-offset: $kendo-use-input-spinner-icon-offset, + $kendo-zindex-popup: $kendo-zindex-popup, + $kendo-zindex-window: $kendo-zindex-window, + $kendo-focus-shadow: $kendo-focus-shadow, + $kendo-transition: $kendo-transition +); */ diff --git a/packages/bootstrap/scss/action-buttons/_index.scss b/packages/bootstrap/scss/action-buttons/_index.scss index 3a726924133..52428c2faf7 100644 --- a/packages/bootstrap/scss/action-buttons/_index.scss +++ b/packages/bootstrap/scss/action-buttons/_index.scss @@ -9,9 +9,12 @@ @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; + // Expose -@mixin action-buttons-styles() { +@mixin kendo-action-buttons--styles() { @include import-once( "action-buttons" ) { + @include core-styles(); + @include kendo-button--styles(); @include kendo-action-buttons--layout(); @include kendo-action-buttons--theme(); @include kendo-utils--flex-grid--justify-content(); diff --git a/packages/bootstrap/scss/action-buttons/_layout.scss b/packages/bootstrap/scss/action-buttons/_layout.scss index 19a7999280e..92c17c3fc63 100644 --- a/packages/bootstrap/scss/action-buttons/_layout.scss +++ b/packages/bootstrap/scss/action-buttons/_layout.scss @@ -1,5 +1,6 @@ +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/action-buttons/_layout.scss"; +@use "@progress/kendo-theme-default/scss/action-buttons/_layout.scss" as *; @mixin kendo-action-buttons--layout() { @include kendo-action-buttons--layout-base(); diff --git a/packages/bootstrap/scss/action-buttons/_theme.scss b/packages/bootstrap/scss/action-buttons/_theme.scss index 08e4490f80c..17a5c13c358 100644 --- a/packages/bootstrap/scss/action-buttons/_theme.scss +++ b/packages/bootstrap/scss/action-buttons/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/action-buttons/_theme.scss"; +@use "@progress/kendo-theme-default/scss/action-buttons/_theme.scss" as *; @mixin kendo-action-buttons--theme() { diff --git a/packages/bootstrap/scss/action-buttons/_variables.scss b/packages/bootstrap/scss/action-buttons/_variables.scss index 5cd17d18777..1d60b518fef 100644 --- a/packages/bootstrap/scss/action-buttons/_variables.scss +++ b/packages/bootstrap/scss/action-buttons/_variables.scss @@ -1,4 +1,3 @@ -@use "sass:map"; @use "../core/_index.scss" as *; // Actions @@ -12,3 +11,16 @@ $kendo-actions-bg: null !default; $kendo-actions-text: null !default; $kendo-actions-border: null !default; $kendo-actions-gradient: null !default; + + +@forward "@progress/kendo-theme-default/scss/action-buttons/_variables.scss" with ( + $kendo-actions-margin-top: $kendo-actions-margin-top, + $kendo-actions-padding-x: $kendo-actions-padding-x, + $kendo-actions-padding-y: $kendo-actions-padding-y, + $kendo-actions-border-width: $kendo-actions-border-width, + $kendo-actions-button-spacing: $kendo-actions-button-spacing, + $kendo-actions-bg: $kendo-actions-bg, + $kendo-actions-text: $kendo-actions-text, + $kendo-actions-border: $kendo-actions-border, + $kendo-actions-gradient: $kendo-actions-gradient +); diff --git a/packages/bootstrap/scss/action-sheet/_index.scss b/packages/bootstrap/scss/action-sheet/_index.scss index 7dbe94353c9..6a81332fc0b 100644 --- a/packages/bootstrap/scss/action-sheet/_index.scss +++ b/packages/bootstrap/scss/action-sheet/_index.scss @@ -13,8 +13,12 @@ // Expose -@mixin action-sheet-styles() { +@mixin kendo-action-sheet--styles() { @include import-once( "action-sheet" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-listgroup--styles(); + @include kendo-popup--styles(); @include kendo-action-sheet--layout(); @include kendo-action-sheet--theme(); @include kendo-utils--layout--overflow(); diff --git a/packages/bootstrap/scss/action-sheet/_layout.scss b/packages/bootstrap/scss/action-sheet/_layout.scss index f43c3fa1b7e..b912980fabe 100644 --- a/packages/bootstrap/scss/action-sheet/_layout.scss +++ b/packages/bootstrap/scss/action-sheet/_layout.scss @@ -1,6 +1,6 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/action-sheet/_layout.scss"; +@use "@progress/kendo-theme-default/scss/action-sheet/_layout.scss" as *; @mixin kendo-action-sheet--layout() { diff --git a/packages/bootstrap/scss/action-sheet/_theme.scss b/packages/bootstrap/scss/action-sheet/_theme.scss index 7f973fe31db..50bcf2c4e26 100644 --- a/packages/bootstrap/scss/action-sheet/_theme.scss +++ b/packages/bootstrap/scss/action-sheet/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/action-sheet/_theme.scss"; +@use "@progress/kendo-theme-default/scss/action-sheet/_theme.scss" as *; @mixin kendo-action-sheet--theme() { diff --git a/packages/bootstrap/scss/action-sheet/_variables.scss b/packages/bootstrap/scss/action-sheet/_variables.scss index 93905f792ed..718f3be6718 100644 --- a/packages/bootstrap/scss/action-sheet/_variables.scss +++ b/packages/bootstrap/scss/action-sheet/_variables.scss @@ -1,4 +1,3 @@ -@use "sass:map"; @use "../core/_index.scss" as *; // Action sheet @@ -86,3 +85,70 @@ $kendo-adaptive-actionsheet-content-padding-x: k-spacing(4) !default; $kendo-adaptive-actionsheet-footer-padding-y: k-spacing(2) !default; $kendo-adaptive-actionsheet-footer-padding-x: k-spacing(4) !default; + + +@forward "@progress/kendo-theme-default/scss/action-sheet/_variables.scss" with ( + $kendo-actionsheet-padding-x: $kendo-actionsheet-padding-x, + $kendo-actionsheet-padding-y: $kendo-actionsheet-padding-y, + $kendo-actionsheet-width: $kendo-actionsheet-width, + $kendo-actionsheet-max-width: $kendo-actionsheet-max-width, + $kendo-actionsheet-height: $kendo-actionsheet-height, + $kendo-actionsheet-max-height: $kendo-actionsheet-max-height, + $kendo-actionsheet-border-width: $kendo-actionsheet-border-width, + $kendo-actionsheet-border-radius: $kendo-actionsheet-border-radius, + $kendo-actionsheet-font-size: $kendo-actionsheet-font-size, + $kendo-actionsheet-font-family: $kendo-actionsheet-font-family, + $kendo-actionsheet-line-height: $kendo-actionsheet-line-height, + $kendo-actionsheet-bg: $kendo-actionsheet-bg, + $kendo-actionsheet-text: $kendo-actionsheet-text, + $kendo-actionsheet-border: $kendo-actionsheet-border, + $kendo-actionsheet-shadow: $kendo-actionsheet-shadow, + $kendo-actionsheet-titlebar-padding-x: $kendo-actionsheet-titlebar-padding-x, + $kendo-actionsheet-titlebar-padding-y: $kendo-actionsheet-titlebar-padding-y, + $kendo-actionsheet-titlebar-border-width: $kendo-actionsheet-titlebar-border-width, + $kendo-actionsheet-titlebar-font-size: $kendo-actionsheet-titlebar-font-size, + $kendo-actionsheet-titlebar-font-family: $kendo-actionsheet-titlebar-font-family, + $kendo-actionsheet-titlebar-line-height: $kendo-actionsheet-titlebar-line-height, + $kendo-actionsheet-titlebar-gap: $kendo-actionsheet-titlebar-gap, + $kendo-actionsheet-titlebar-bg: $kendo-actionsheet-titlebar-bg, + $kendo-actionsheet-titlebar-text: $kendo-actionsheet-titlebar-text, + $kendo-actionsheet-titlebar-border: $kendo-actionsheet-titlebar-border, + $kendo-actionsheet-titlebar-gradient: $kendo-actionsheet-titlebar-gradient, + $kendo-actionsheet-titlebar-shadow: $kendo-actionsheet-titlebar-shadow, + $kendo-actionsheet-subtitle-font-size: $kendo-actionsheet-subtitle-font-size, + $kendo-actionsheet-subtitle-line-height: $kendo-actionsheet-subtitle-line-height, + $kendo-actionsheet-subtitle-text: $kendo-actionsheet-subtitle-text, + $kendo-actionsheet-item-min-height: $kendo-actionsheet-item-min-height, + $kendo-actionsheet-item-padding-x: $kendo-actionsheet-item-padding-x, + $kendo-actionsheet-item-padding-y: $kendo-actionsheet-item-padding-y, + $kendo-actionsheet-item-border-width: $kendo-actionsheet-item-border-width, + $kendo-actionsheet-item-spacing: $kendo-actionsheet-item-spacing, + $kendo-actionsheet-item-title-font-weight: $kendo-actionsheet-item-title-font-weight, + $kendo-actionsheet-item-title-text-transform: $kendo-actionsheet-item-title-text-transform, + $kendo-actionsheet-item-description-font-size: $kendo-actionsheet-item-description-font-size, + $kendo-actionsheet-item-description-text: $kendo-actionsheet-item-description-text, + $kendo-actionsheet-item-hover-bg: $kendo-actionsheet-item-hover-bg, + $kendo-actionsheet-item-hover-text: $kendo-actionsheet-item-hover-text, + $kendo-actionsheet-item-hover-border: $kendo-actionsheet-item-hover-border, + $kendo-actionsheet-item-hover-gradient: $kendo-actionsheet-item-hover-gradient, + $kendo-actionsheet-item-hover-shadow: $kendo-actionsheet-item-hover-shadow, + $kendo-actionsheet-item-focus-bg: $kendo-actionsheet-item-focus-bg, + $kendo-actionsheet-item-focus-text: $kendo-actionsheet-item-focus-text, + $kendo-actionsheet-item-focus-border: $kendo-actionsheet-item-focus-border, + $kendo-actionsheet-item-focus-gradient: $kendo-actionsheet-item-focus-gradient, + $kendo-actionsheet-item-focus-shadow: $kendo-actionsheet-item-focus-shadow, + $kendo-actionsheet-item-disabled-bg: $kendo-actionsheet-item-disabled-bg, + $kendo-actionsheet-item-disabled-text: $kendo-actionsheet-item-disabled-text, + $kendo-actionsheet-item-disabled-border: $kendo-actionsheet-item-disabled-border, + $kendo-actionsheet-item-disabled-gradient: $kendo-actionsheet-item-disabled-gradient, + $kendo-actionsheet-item-disabled-shadow: $kendo-actionsheet-item-disabled-shadow, + $kendo-adaptive-actionsheet-font-size: $kendo-adaptive-actionsheet-font-size, + $kendo-adaptive-actionsheet-titlebar-border-width: $kendo-adaptive-actionsheet-titlebar-border-width, + $kendo-adaptive-actionsheet-titlebar-padding-y: $kendo-adaptive-actionsheet-titlebar-padding-y, + $kendo-adaptive-actionsheet-titlebar-padding-x: $kendo-adaptive-actionsheet-titlebar-padding-x, + $kendo-adaptive-actionsheet-titlebar-border: $kendo-adaptive-actionsheet-titlebar-border, + $kendo-adaptive-actionsheet-content-padding-y: $kendo-adaptive-actionsheet-content-padding-y, + $kendo-adaptive-actionsheet-content-padding-x: $kendo-adaptive-actionsheet-content-padding-x, + $kendo-adaptive-actionsheet-footer-padding-y: $kendo-adaptive-actionsheet-footer-padding-y, + $kendo-adaptive-actionsheet-footer-padding-x: $kendo-adaptive-actionsheet-footer-padding-x +); diff --git a/packages/bootstrap/scss/adaptive/_index.scss b/packages/bootstrap/scss/adaptive/_index.scss index 4f93fcb3e8a..bef15ab66e1 100644 --- a/packages/bootstrap/scss/adaptive/_index.scss +++ b/packages/bootstrap/scss/adaptive/_index.scss @@ -4,7 +4,7 @@ @use "./_theme.scss" as *; -// Dependencies +// Dependencies (TODO: extract variables) @use "../core/_index.scss" as *; @use "../listgroup/_index.scss" as *; @use "../checkbox/_index.scss" as *; @@ -14,8 +14,14 @@ // Expose -@mixin adaptive-styles() { +@mixin kendo-adaptive--styles() { @include import-once( "adaptive" ) { + @include core-styles(); + @include kendo-listgroup--styles(); + @include kendo-checkbox--styles(); + @include kendo-radio--styles(); + @include kendo-switch--styles(); + @include kendo-toolbar--styles(); @include kendo-adaptive--layout(); @include kendo-adaptive--theme(); } diff --git a/packages/bootstrap/scss/adaptive/_layout.scss b/packages/bootstrap/scss/adaptive/_layout.scss index fc1fa6902f6..52af0fddcb8 100644 --- a/packages/bootstrap/scss/adaptive/_layout.scss +++ b/packages/bootstrap/scss/adaptive/_layout.scss @@ -1,8 +1,6 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@use "../toolbar/_variables.scss" as *; -@use "../listgroup/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/adaptive/_layout.scss"; +@use "@progress/kendo-theme-default/scss/adaptive/_layout.scss" as *; @mixin kendo-adaptive--layout() { diff --git a/packages/bootstrap/scss/adaptive/_theme.scss b/packages/bootstrap/scss/adaptive/_theme.scss index 477f6905d42..6e8508ccdb0 100644 --- a/packages/bootstrap/scss/adaptive/_theme.scss +++ b/packages/bootstrap/scss/adaptive/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/adaptive/_theme.scss"; +@use "@progress/kendo-theme-default/scss/adaptive/_theme.scss" as *; @mixin kendo-adaptive--theme() { diff --git a/packages/bootstrap/scss/adaptive/_variables.scss b/packages/bootstrap/scss/adaptive/_variables.scss index 5260e070622..86fe23995c1 100644 --- a/packages/bootstrap/scss/adaptive/_variables.scss +++ b/packages/bootstrap/scss/adaptive/_variables.scss @@ -1,4 +1,3 @@ -@use "sass:map"; @use "../core/_index.scss" as *; // Adaptive Common @@ -29,3 +28,25 @@ $kendo-adaptive-grid-sort-text: $kendo-color-primary !default; $kendo-adaptive-scheduler-current-text: $kendo-color-primary !default; $kendo-adaptive-scheduler-base-text: inherit !default; $kendo-adaptive-scheduler-subtle-text: $kendo-subtle-text !default; + + +@forward "@progress/kendo-theme-default/scss/adaptive/_variables.scss" with ( + $kendo-adaptive-bg: $kendo-adaptive-bg, + $kendo-adaptive-text: $kendo-adaptive-text, + $kendo-adaptive-border: $kendo-adaptive-border, + $kendo-adaptive-content-bg: $kendo-adaptive-content-bg, + $kendo-adaptive-content-text: $kendo-adaptive-content-text, + $kendo-adaptive-menu-bg: $kendo-adaptive-menu-bg, + $kendo-adaptive-menu-text: $kendo-adaptive-menu-text, + $kendo-adaptive-menu-clear-text: $kendo-adaptive-menu-clear-text, + $kendo-adaptive-menu-item-border: $kendo-adaptive-menu-item-border, + $kendo-adaptive-menu-title-text: $kendo-adaptive-menu-title-text, + $kendo-adaptive-border-width: $kendo-adaptive-border-width, + $kendo-adaptive-font-family: $kendo-adaptive-font-family, + $kendo-adaptive-font-size: $kendo-adaptive-font-size, + $kendo-adaptive-line-height: $kendo-adaptive-line-height, + $kendo-adaptive-grid-sort-text: $kendo-adaptive-grid-sort-text, + $kendo-adaptive-scheduler-current-text: $kendo-adaptive-scheduler-current-text, + $kendo-adaptive-scheduler-base-text: $kendo-adaptive-scheduler-base-text, + $kendo-adaptive-scheduler-subtle-text: $kendo-adaptive-scheduler-subtle-text +); diff --git a/packages/bootstrap/scss/appbar/_index.scss b/packages/bootstrap/scss/appbar/_index.scss index 8dd591395b3..fc24bb02cdc 100644 --- a/packages/bootstrap/scss/appbar/_index.scss +++ b/packages/bootstrap/scss/appbar/_index.scss @@ -9,8 +9,9 @@ // Expose -@mixin appbar-styles() { +@mixin kendo-appbar--styles() { @include import-once( "appbar" ) { + @include core-styles(); @include kendo-appbar--layout(); @include kendo-appbar--theme(); } diff --git a/packages/bootstrap/scss/appbar/_layout.scss b/packages/bootstrap/scss/appbar/_layout.scss index 8541f837f4c..f2ebe95b775 100644 --- a/packages/bootstrap/scss/appbar/_layout.scss +++ b/packages/bootstrap/scss/appbar/_layout.scss @@ -1,6 +1,6 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/appbar/_layout.scss"; +@use "@progress/kendo-theme-default/scss/appbar/_layout.scss" as *; @mixin kendo-appbar--layout() { diff --git a/packages/bootstrap/scss/appbar/_theme.scss b/packages/bootstrap/scss/appbar/_theme.scss index 3695f81ed26..3ed9ee8c35d 100644 --- a/packages/bootstrap/scss/appbar/_theme.scss +++ b/packages/bootstrap/scss/appbar/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/appbar/_theme.scss"; +@use "@progress/kendo-theme-default/scss/appbar/_theme.scss" as *; @mixin kendo-appbar--theme() { diff --git a/packages/bootstrap/scss/appbar/_variables.scss b/packages/bootstrap/scss/appbar/_variables.scss index 89f0c42c07f..f94b0ca679f 100644 --- a/packages/bootstrap/scss/appbar/_variables.scss +++ b/packages/bootstrap/scss/appbar/_variables.scss @@ -1,4 +1,3 @@ -@use "sass:map"; @use "../core/_index.scss" as *; // AppBar @@ -54,3 +53,23 @@ $kendo-appbar-box-shadow: k-elevation(4) !default; /// The box shadow of the AppBar with bottom position. /// @group appbar $kendo-appbar-bottom-box-shadow: k-elevation(4) !default; + + +@forward "@progress/kendo-theme-default/scss/appbar/_variables.scss" with ( + $kendo-appbar-margin-x: $kendo-appbar-margin-x, + $kendo-appbar-margin-y: $kendo-appbar-margin-y, + $kendo-appbar-padding-x: $kendo-appbar-padding-x, + $kendo-appbar-padding-y: $kendo-appbar-padding-y, + $kendo-appbar-border-width: $kendo-appbar-border-width, + $kendo-appbar-zindex: $kendo-appbar-zindex, + $kendo-appbar-font-family: $kendo-appbar-font-family, + $kendo-appbar-font-size: $kendo-appbar-font-size, + $kendo-appbar-line-height: $kendo-appbar-line-height, + $kendo-appbar-gap: $kendo-appbar-gap, + $kendo-appbar-light-bg: $kendo-appbar-light-bg, + $kendo-appbar-light-text: $kendo-appbar-light-text, + $kendo-appbar-dark-bg: $kendo-appbar-dark-bg, + $kendo-appbar-dark-text: $kendo-appbar-dark-text, + $kendo-appbar-box-shadow: $kendo-appbar-box-shadow, + $kendo-appbar-bottom-box-shadow: $kendo-appbar-bottom-box-shadow +); diff --git a/packages/bootstrap/scss/autocomplete/_index.scss b/packages/bootstrap/scss/autocomplete/_index.scss index 31b56108c67..43a5851b3da 100644 --- a/packages/bootstrap/scss/autocomplete/_index.scss +++ b/packages/bootstrap/scss/autocomplete/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @@ -14,8 +15,14 @@ // Expose -@mixin autocomplete-styles() { +@mixin kendo-autocomplete--styles() { @include import-once( "autocomplete" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-icon--styles(); @include kendo-autocomplete--layout(); @include kendo-autocomplete--theme(); } diff --git a/packages/bootstrap/scss/autocomplete/_layout.scss b/packages/bootstrap/scss/autocomplete/_layout.scss index 2b505531532..fba3ef4acf9 100644 --- a/packages/bootstrap/scss/autocomplete/_layout.scss +++ b/packages/bootstrap/scss/autocomplete/_layout.scss @@ -1,4 +1,6 @@ -@import "@progress/kendo-theme-default/scss/autocomplete/_layout.scss"; +@use "../_variables.scss" as *; +@use "./_variables.scss" as *; +@use "@progress/kendo-theme-default/scss/autocomplete/_layout.scss" as *; @mixin kendo-autocomplete--layout() { diff --git a/packages/bootstrap/scss/autocomplete/_theme.scss b/packages/bootstrap/scss/autocomplete/_theme.scss index beeae4533b3..79d6558a4c4 100644 --- a/packages/bootstrap/scss/autocomplete/_theme.scss +++ b/packages/bootstrap/scss/autocomplete/_theme.scss @@ -1,4 +1,5 @@ -@import "@progress/kendo-theme-default/scss/autocomplete/_theme.scss"; +@use "./_variables.scss" as *; +@use "@progress/kendo-theme-default/scss/autocomplete/_theme.scss" as *; @mixin kendo-autocomplete--theme() { diff --git a/packages/bootstrap/scss/avatar/_index.scss b/packages/bootstrap/scss/avatar/_index.scss index 035822ae9f6..28dfe879d46 100644 --- a/packages/bootstrap/scss/avatar/_index.scss +++ b/packages/bootstrap/scss/avatar/_index.scss @@ -9,8 +9,9 @@ // Expose -@mixin avatar-styles() { +@mixin kendo-avatar--styles() { @include import-once( "avatar" ) { + @include core-styles(); @include kendo-avatar--layout(); @include kendo-avatar--theme(); } diff --git a/packages/bootstrap/scss/avatar/_layout.scss b/packages/bootstrap/scss/avatar/_layout.scss index f3b5953de85..56fcfd8df77 100644 --- a/packages/bootstrap/scss/avatar/_layout.scss +++ b/packages/bootstrap/scss/avatar/_layout.scss @@ -1,5 +1,6 @@ +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/avatar/_layout.scss"; +@use "@progress/kendo-theme-default/scss/avatar/_layout.scss" as *; @mixin kendo-avatar--layout() { diff --git a/packages/bootstrap/scss/avatar/_theme.scss b/packages/bootstrap/scss/avatar/_theme.scss index 8024861a8c8..2e1c2d5b00b 100644 --- a/packages/bootstrap/scss/avatar/_theme.scss +++ b/packages/bootstrap/scss/avatar/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/avatar/_theme.scss"; +@use "@progress/kendo-theme-default/scss/avatar/_theme.scss" as *; @mixin kendo-avatar--theme() { diff --git a/packages/bootstrap/scss/avatar/_variables.scss b/packages/bootstrap/scss/avatar/_variables.scss index 10780c2db80..341f0b32c8e 100644 --- a/packages/bootstrap/scss/avatar/_variables.scss +++ b/packages/bootstrap/scss/avatar/_variables.scss @@ -28,3 +28,13 @@ $kendo-avatar-sizes: ( /// The theme colors map of the Avatar. /// @group avatar $kendo-avatar-theme-colors: $kendo-theme-colors !default; + + +@forward "@progress/kendo-theme-default/scss/avatar/_variables.scss" with ( + $kendo-avatar-border-width: $kendo-avatar-border-width, + $kendo-avatar-font-family: $kendo-avatar-font-family, + $kendo-avatar-font-size: $kendo-avatar-font-size, + $kendo-avatar-line-height: $kendo-avatar-line-height, + $kendo-avatar-sizes: $kendo-avatar-sizes, + $kendo-avatar-theme-colors: $kendo-avatar-theme-colors +); diff --git a/packages/bootstrap/scss/badge/_index.scss b/packages/bootstrap/scss/badge/_index.scss index 4da05463f1b..0f0ed49e5d2 100644 --- a/packages/bootstrap/scss/badge/_index.scss +++ b/packages/bootstrap/scss/badge/_index.scss @@ -8,9 +8,12 @@ @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose @mixin kendo-badge--styles() { @include import-once( "badge" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-badge--layout(); @include kendo-badge--theme(); } diff --git a/packages/bootstrap/scss/badge/_layout.scss b/packages/bootstrap/scss/badge/_layout.scss index f6d2e4c727c..d772f04da62 100644 --- a/packages/bootstrap/scss/badge/_layout.scss +++ b/packages/bootstrap/scss/badge/_layout.scss @@ -1,3 +1,5 @@ +@use "../_variables.scss" as *; +@use "./_variables.scss" as *; @use "@progress/kendo-theme-default/scss/badge/_layout.scss" as *; diff --git a/packages/bootstrap/scss/badge/_theme.scss b/packages/bootstrap/scss/badge/_theme.scss index d61e955cf7b..bddc4bda5a3 100644 --- a/packages/bootstrap/scss/badge/_theme.scss +++ b/packages/bootstrap/scss/badge/_theme.scss @@ -1,3 +1,4 @@ +@use "./_variables.scss" as *; @use "@progress/kendo-theme-default/scss/badge/_theme.scss" as *; diff --git a/packages/bootstrap/scss/badge/_variables.scss b/packages/bootstrap/scss/badge/_variables.scss index b755518de37..66370b3c57d 100644 --- a/packages/bootstrap/scss/badge/_variables.scss +++ b/packages/bootstrap/scss/badge/_variables.scss @@ -102,3 +102,30 @@ $kendo-badge-sizes: ( min-width: $kendo-badge-lg-min-width ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/badge/_variables.scss" with ( + $kendo-badge-border-width: $kendo-badge-border-width, + $kendo-badge-border-radius: $kendo-badge-border-radius, + $kendo-badge-padding-x: $kendo-badge-padding-x, + $kendo-badge-sm-padding-x: $kendo-badge-sm-padding-x, + $kendo-badge-md-padding-x: $kendo-badge-md-padding-x, + $kendo-badge-lg-padding-x: $kendo-badge-lg-padding-x, + $kendo-badge-padding-y: $kendo-badge-padding-y, + $kendo-badge-sm-padding-y: $kendo-badge-sm-padding-y, + $kendo-badge-md-padding-y: $kendo-badge-md-padding-y, + $kendo-badge-lg-padding-y: $kendo-badge-lg-padding-y, + $kendo-badge-font-size: $kendo-badge-font-size, + $kendo-badge-sm-font-size: $kendo-badge-sm-font-size, + $kendo-badge-md-font-size: $kendo-badge-md-font-size, + $kendo-badge-lg-font-size: $kendo-badge-lg-font-size, + $kendo-badge-line-height: $kendo-badge-line-height, + $kendo-badge-sm-line-height: $kendo-badge-sm-line-height, + $kendo-badge-md-line-height: $kendo-badge-md-line-height, + $kendo-badge-lg-line-height: $kendo-badge-lg-line-height, + $kendo-badge-min-width: $kendo-badge-min-width, + $kendo-badge-sm-min-width: $kendo-badge-sm-min-width, + $kendo-badge-md-min-width: $kendo-badge-md-min-width, + $kendo-badge-lg-min-width: $kendo-badge-lg-min-width, + $kendo-badge-sizes: $kendo-badge-sizes +); diff --git a/packages/bootstrap/scss/bottom-navigation/_index.scss b/packages/bootstrap/scss/bottom-navigation/_index.scss index e9a18006bec..a14d59eb8d0 100644 --- a/packages/bootstrap/scss/bottom-navigation/_index.scss +++ b/packages/bootstrap/scss/bottom-navigation/_index.scss @@ -11,8 +11,10 @@ // Expose -@mixin bottom-navigation-styles() { +@mixin kendo-bottom-navigation--styles() { @include import-once( "bottom-navigation" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-bottom-navigation--layout(); @include kendo-bottom-navigation--theme(); @include kendo-utils--layout--position(); diff --git a/packages/bootstrap/scss/bottom-navigation/_layout.scss b/packages/bootstrap/scss/bottom-navigation/_layout.scss index b639ad2c8b6..9d341feda3a 100644 --- a/packages/bootstrap/scss/bottom-navigation/_layout.scss +++ b/packages/bootstrap/scss/bottom-navigation/_layout.scss @@ -1,6 +1,6 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/bottom-navigation/_layout.scss"; +@use "@progress/kendo-theme-default/scss/bottom-navigation/_layout.scss" as *; @mixin kendo-bottom-navigation--layout() { diff --git a/packages/bootstrap/scss/bottom-navigation/_theme.scss b/packages/bootstrap/scss/bottom-navigation/_theme.scss index 7606f00b755..c90128343e5 100644 --- a/packages/bootstrap/scss/bottom-navigation/_theme.scss +++ b/packages/bootstrap/scss/bottom-navigation/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/bottom-navigation/_theme.scss"; +@use "@progress/kendo-theme-default/scss/bottom-navigation/_theme.scss" as *; @mixin kendo-bottom-navigation--theme() { diff --git a/packages/bootstrap/scss/bottom-navigation/_variables.scss b/packages/bootstrap/scss/bottom-navigation/_variables.scss index e014f659abe..c6c52ba204c 100644 --- a/packages/bootstrap/scss/bottom-navigation/_variables.scss +++ b/packages/bootstrap/scss/bottom-navigation/_variables.scss @@ -1,6 +1,5 @@ -@use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +@use "../icon/_variables.scss" as *; // BottomNavigation @@ -64,3 +63,26 @@ $kendo-bottom-nav-flat-bg: $kendo-component-bg !default; /// The border color of the flat BottomNavigation. /// @group bottom-navigation $kendo-bottom-nav-flat-border: $kendo-component-border !default; + + +@forward "@progress/kendo-theme-default/scss/bottom-navigation/_variables.scss" with ( + $kendo-bottom-nav-padding-x: $kendo-bottom-nav-padding-x, + $kendo-bottom-nav-padding-y: $kendo-bottom-nav-padding-y, + $kendo-bottom-nav-gap: $kendo-bottom-nav-gap, + $kendo-bottom-nav-border-width: $kendo-bottom-nav-border-width, + $kendo-bottom-nav-font-family: $kendo-bottom-nav-font-family, + $kendo-bottom-nav-font-size: $kendo-bottom-nav-font-size, + $kendo-bottom-nav-line-height: $kendo-bottom-nav-line-height, + $kendo-bottom-nav-letter-spacing: $kendo-bottom-nav-letter-spacing, + $kendo-bottom-nav-item-padding-x: $kendo-bottom-nav-item-padding-x, + $kendo-bottom-nav-item-padding-y: $kendo-bottom-nav-item-padding-y, + $kendo-bottom-nav-item-min-width: $kendo-bottom-nav-item-min-width, + $kendo-bottom-nav-item-max-width: $kendo-bottom-nav-item-max-width, + $kendo-bottom-nav-item-min-height: $kendo-bottom-nav-item-min-height, + $kendo-bottom-nav-item-border-radius: $kendo-bottom-nav-item-border-radius, + $kendo-bottom-nav-item-gap: $kendo-bottom-nav-item-gap, + $kendo-bottom-nav-shadow: $kendo-bottom-nav-shadow, + $kendo-bottom-nav-flat-text: $kendo-bottom-nav-flat-text, + $kendo-bottom-nav-flat-bg: $kendo-bottom-nav-flat-bg, + $kendo-bottom-nav-flat-border: $kendo-bottom-nav-flat-border +); diff --git a/packages/bootstrap/scss/breadcrumb/_index.scss b/packages/bootstrap/scss/breadcrumb/_index.scss index 713924b0e51..1630747811e 100644 --- a/packages/bootstrap/scss/breadcrumb/_index.scss +++ b/packages/bootstrap/scss/breadcrumb/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -12,8 +13,11 @@ // Expose -@mixin breadcrumb-styles() { +@mixin kendo-breadcrumb--styles() { @include import-once( "breadcrumb" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-icon--styles(); @include kendo-breadcrumb--layout(); @include kendo-breadcrumb--theme(); @include kendo-utils--flex-grid--flex(); diff --git a/packages/bootstrap/scss/breadcrumb/_layout.scss b/packages/bootstrap/scss/breadcrumb/_layout.scss index 3d6916e2f42..f4a381c89de 100644 --- a/packages/bootstrap/scss/breadcrumb/_layout.scss +++ b/packages/bootstrap/scss/breadcrumb/_layout.scss @@ -1,6 +1,7 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/breadcrumb/_layout.scss"; +@use "@progress/kendo-theme-default/scss/breadcrumb/_layout.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; @mixin kendo-breadcrumb--layout() { diff --git a/packages/bootstrap/scss/breadcrumb/_theme.scss b/packages/bootstrap/scss/breadcrumb/_theme.scss index 43e592cafae..f90cfe66eaa 100644 --- a/packages/bootstrap/scss/breadcrumb/_theme.scss +++ b/packages/bootstrap/scss/breadcrumb/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/breadcrumb/_theme.scss"; +@use "@progress/kendo-theme-default/scss/breadcrumb/_theme.scss" as *; @mixin kendo-breadcrumb--theme() { diff --git a/packages/bootstrap/scss/breadcrumb/_variables.scss b/packages/bootstrap/scss/breadcrumb/_variables.scss index a1960234528..c864ee65b94 100644 --- a/packages/bootstrap/scss/breadcrumb/_variables.scss +++ b/packages/bootstrap/scss/breadcrumb/_variables.scss @@ -1,4 +1,3 @@ -@use "sass:map"; @use "../core/_index.scss" as *; @use "../icon/_variables.scss" as *; @@ -234,3 +233,68 @@ $kendo-breadcrumb-sizes: ( line-height: $kendo-breadcrumb-lg-line-height ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/breadcrumb/_variables.scss" with ( + $kendo-breadcrumb-border-width: $kendo-breadcrumb-border-width, + $kendo-breadcrumb-margin-x: $kendo-breadcrumb-margin-x, + $kendo-breadcrumb-margin-y: $kendo-breadcrumb-margin-y, + $kendo-breadcrumb-padding-x: $kendo-breadcrumb-padding-x, + $kendo-breadcrumb-padding-y: $kendo-breadcrumb-padding-y, + $kendo-breadcrumb-font-family: $kendo-breadcrumb-font-family, + $kendo-breadcrumb-font-size: $kendo-breadcrumb-font-size, + $kendo-breadcrumb-sm-font-size: $kendo-breadcrumb-sm-font-size, + $kendo-breadcrumb-md-font-size: $kendo-breadcrumb-md-font-size, + $kendo-breadcrumb-lg-font-size: $kendo-breadcrumb-lg-font-size, + $kendo-breadcrumb-line-height: $kendo-breadcrumb-line-height, + $kendo-breadcrumb-sm-line-height: $kendo-breadcrumb-sm-line-height, + $kendo-breadcrumb-md-line-height: $kendo-breadcrumb-md-line-height, + $kendo-breadcrumb-lg-line-height: $kendo-breadcrumb-lg-line-height, + $kendo-breadcrumb-bg: $kendo-breadcrumb-bg, + $kendo-breadcrumb-text: $kendo-breadcrumb-text, + $kendo-breadcrumb-border: $kendo-breadcrumb-border, + $kendo-breadcrumb-focus-shadow: $kendo-breadcrumb-focus-shadow, + $kendo-breadcrumb-link-padding-x: $kendo-breadcrumb-link-padding-x, + $kendo-breadcrumb-sm-link-padding-x: $kendo-breadcrumb-sm-link-padding-x, + $kendo-breadcrumb-md-link-padding-x: $kendo-breadcrumb-md-link-padding-x, + $kendo-breadcrumb-lg-link-padding-x: $kendo-breadcrumb-lg-link-padding-x, + $kendo-breadcrumb-link-padding-y: $kendo-breadcrumb-link-padding-y, + $kendo-breadcrumb-sm-link-padding-y: $kendo-breadcrumb-sm-link-padding-y, + $kendo-breadcrumb-md-link-padding-y: $kendo-breadcrumb-md-link-padding-y, + $kendo-breadcrumb-lg-link-padding-y: $kendo-breadcrumb-lg-link-padding-y, + $kendo-breadcrumb-link-border-radius: $kendo-breadcrumb-link-border-radius, + $kendo-breadcrumb-icon-link-padding-y: $kendo-breadcrumb-icon-link-padding-y, + $kendo-breadcrumb-sm-icon-link-padding-y: $kendo-breadcrumb-sm-icon-link-padding-y, + $kendo-breadcrumb-md-icon-link-padding-y: $kendo-breadcrumb-md-icon-link-padding-y, + $kendo-breadcrumb-lg-icon-link-padding-y: $kendo-breadcrumb-lg-icon-link-padding-y, + $kendo-breadcrumb-icon-link-padding-x: $kendo-breadcrumb-icon-link-padding-x, + $kendo-breadcrumb-sm-icon-link-padding-x: $kendo-breadcrumb-sm-icon-link-padding-x, + $kendo-breadcrumb-md-icon-link-padding-x: $kendo-breadcrumb-md-icon-link-padding-x, + $kendo-breadcrumb-lg-icon-link-padding-x: $kendo-breadcrumb-lg-icon-link-padding-x, + $kendo-breadcrumb-link-initial-text: $kendo-breadcrumb-link-initial-text, + $kendo-breadcrumb-link-icon-spacing: $kendo-breadcrumb-link-icon-spacing, + $kendo-breadcrumb-link-bg: $kendo-breadcrumb-link-bg, + $kendo-breadcrumb-link-text: $kendo-breadcrumb-link-text, + $kendo-breadcrumb-link-border: $kendo-breadcrumb-link-border, + $kendo-breadcrumb-link-hover-bg: $kendo-breadcrumb-link-hover-bg, + $kendo-breadcrumb-link-hover-text: $kendo-breadcrumb-link-hover-text, + $kendo-breadcrumb-link-hover-border: $kendo-breadcrumb-link-hover-border, + $kendo-breadcrumb-link-focus-bg: $kendo-breadcrumb-link-focus-bg, + $kendo-breadcrumb-link-focus-text: $kendo-breadcrumb-link-focus-text, + $kendo-breadcrumb-link-focus-border: $kendo-breadcrumb-link-focus-border, + $kendo-breadcrumb-link-focus-shadow: $kendo-breadcrumb-link-focus-shadow, + $kendo-breadcrumb-root-link-bg: $kendo-breadcrumb-root-link-bg, + $kendo-breadcrumb-root-link-text: $kendo-breadcrumb-root-link-text, + $kendo-breadcrumb-root-link-border: $kendo-breadcrumb-root-link-border, + $kendo-breadcrumb-root-link-hover-bg: $kendo-breadcrumb-root-link-hover-bg, + $kendo-breadcrumb-root-link-hover-text: $kendo-breadcrumb-root-link-hover-text, + $kendo-breadcrumb-root-link-hover-border: $kendo-breadcrumb-root-link-hover-border, + $kendo-breadcrumb-root-link-focus-bg: $kendo-breadcrumb-root-link-focus-bg, + $kendo-breadcrumb-root-link-focus-text: $kendo-breadcrumb-root-link-focus-text, + $kendo-breadcrumb-root-link-focus-border: $kendo-breadcrumb-root-link-focus-border, + $kendo-breadcrumb-root-link-focus-shadow: $kendo-breadcrumb-root-link-focus-shadow, + $kendo-breadcrumb-current-item-bg: $kendo-breadcrumb-current-item-bg, + $kendo-breadcrumb-current-item-text: $kendo-breadcrumb-current-item-text, + $kendo-breadcrumb-current-item-border: $kendo-breadcrumb-current-item-border, + $kendo-breadcrumb-sizes: $kendo-breadcrumb-sizes +); diff --git a/packages/bootstrap/scss/button/_variables.scss b/packages/bootstrap/scss/button/_variables.scss index cccc7694a25..821fbebbac9 100644 --- a/packages/bootstrap/scss/button/_variables.scss +++ b/packages/bootstrap/scss/button/_variables.scss @@ -261,6 +261,7 @@ $kendo-flat-button-focus-ring-opacity: .12 !default; /// @group button $kendo-button-transition: $kendo-transition !default; + @forward "@progress/kendo-theme-default/scss/button/_variables.scss" with ( $kendo-button-border-width: $kendo-button-border-width, $kendo-button-border-radius: $kendo-button-border-radius, @@ -290,8 +291,6 @@ $kendo-button-transition: $kendo-transition !default; $kendo-button-md-inner-calc-size: $kendo-button-md-inner-calc-size, $kendo-button-lg-inner-calc-size: $kendo-button-lg-inner-calc-size, $kendo-button-sizes: $kendo-button-sizes, - $kendo-button-transition: $kendo-transition, - $kendo-button-theme-colors: $kendo-button-theme-colors, $kendo-button-bg: $kendo-button-bg, $kendo-button-text: $kendo-button-text, @@ -351,5 +350,6 @@ $kendo-button-transition: $kendo-transition !default; $kendo-flat-button-focus-opacity: $kendo-flat-button-focus-opacity, $kendo-flat-button-active-opacity: $kendo-flat-button-active-opacity, $kendo-flat-button-selected-opacity: $kendo-flat-button-selected-opacity, - $kendo-flat-button-focus-ring-opacity: $kendo-flat-button-focus-ring-opacity + $kendo-flat-button-focus-ring-opacity: $kendo-flat-button-focus-ring-opacity, + $kendo-button-transition: $kendo-button-transition ); diff --git a/packages/bootstrap/scss/calendar/_index.scss b/packages/bootstrap/scss/calendar/_index.scss index 25935584987..9c720454167 100644 --- a/packages/bootstrap/scss/calendar/_index.scss +++ b/packages/bootstrap/scss/calendar/_index.scss @@ -13,8 +13,12 @@ // Expose -@mixin calendar-styles() { +@mixin kendo-calendar--styles() { @include import-once( "calendar" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-icon--styles(); + @include kendo-list--styles(); @include kendo-calendar--layout(); @include kendo-calendar--theme(); @include kendo-utils--flex-grid--align-items(); diff --git a/packages/bootstrap/scss/calendar/_layout.scss b/packages/bootstrap/scss/calendar/_layout.scss index 665b1e8870f..4743f9f608f 100644 --- a/packages/bootstrap/scss/calendar/_layout.scss +++ b/packages/bootstrap/scss/calendar/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/calendar/_layout.scss"; +@use "@progress/kendo-theme-default/scss/calendar/_layout.scss" as *; @mixin kendo-calendar--layout() { diff --git a/packages/bootstrap/scss/calendar/_theme.scss b/packages/bootstrap/scss/calendar/_theme.scss index 2f6337993d0..29e65636779 100644 --- a/packages/bootstrap/scss/calendar/_theme.scss +++ b/packages/bootstrap/scss/calendar/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/calendar/_theme.scss"; +@use "@progress/kendo-theme-default/scss/calendar/_theme.scss" as *; @mixin kendo-calendar--theme() { diff --git a/packages/bootstrap/scss/calendar/_variables.scss b/packages/bootstrap/scss/calendar/_variables.scss index 13bf5990227..bf1aa319bc8 100644 --- a/packages/bootstrap/scss/calendar/_variables.scss +++ b/packages/bootstrap/scss/calendar/_variables.scss @@ -1,5 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "../button/_variables.scss" as *; // Calendar @@ -353,3 +354,103 @@ $kendo-calendar-sizes: ( cell-padding-y: $kendo-calendar-lg-cell-padding-x ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/calendar/_variables.scss" with ( + $kendo-calendar-border-width: $kendo-calendar-border-width, + $kendo-calendar-font-family: $kendo-calendar-font-family, + $kendo-calendar-font-size: $kendo-calendar-font-size, + $kendo-calendar-line-height: $kendo-calendar-line-height, + $kendo-calendar-cell-size: $kendo-calendar-cell-size, + $kendo-calendar-bg: $kendo-calendar-bg, + $kendo-calendar-text: $kendo-calendar-text, + $kendo-calendar-border: $kendo-calendar-border, + $kendo-calendar-header-padding-x: $kendo-calendar-header-padding-x, + $kendo-calendar-header-padding-y: $kendo-calendar-header-padding-y, + $kendo-calendar-header-border-width: $kendo-calendar-header-border-width, + $kendo-calendar-header-bg: $kendo-calendar-header-bg, + $kendo-calendar-header-text: $kendo-calendar-header-text, + $kendo-calendar-header-border: $kendo-calendar-header-border, + $kendo-calendar-header-gradient: $kendo-calendar-header-gradient, + $kendo-calendar-header-shadow: $kendo-calendar-header-shadow, + $kendo-calendar-nav-gap: $kendo-calendar-nav-gap, + $kendo-calendar-footer-padding-x: $kendo-calendar-footer-padding-x, + $kendo-calendar-footer-padding-y: $kendo-calendar-footer-padding-y, + $kendo-calendar-cell-padding-x: $kendo-calendar-cell-padding-x, + $kendo-calendar-cell-padding-y: $kendo-calendar-cell-padding-y, + $kendo-calendar-cell-line-height: $kendo-calendar-cell-line-height, + $kendo-calendar-cell-border-radius: $kendo-calendar-cell-border-radius, + $kendo-calendar-header-cell-padding-x: $kendo-calendar-header-cell-padding-x, + $kendo-calendar-header-cell-padding-y: $kendo-calendar-header-cell-padding-y, + $kendo-calendar-header-cell-width: $kendo-calendar-header-cell-width, + $kendo-calendar-header-cell-height: $kendo-calendar-header-cell-height, + $kendo-calendar-header-cell-font-size: $kendo-calendar-header-cell-font-size, + $kendo-calendar-header-cell-line-height: $kendo-calendar-header-cell-line-height, + $kendo-calendar-header-cell-bg: $kendo-calendar-header-cell-bg, + $kendo-calendar-header-cell-text: $kendo-calendar-header-cell-text, + $kendo-calendar-header-cell-opacity: $kendo-calendar-header-cell-opacity, + $kendo-calendar-caption-padding-x: $kendo-calendar-caption-padding-x, + $kendo-calendar-caption-padding-y: $kendo-calendar-caption-padding-y, + $kendo-calendar-caption-height: $kendo-calendar-caption-height, + $kendo-calendar-caption-font-size: $kendo-calendar-caption-font-size, + $kendo-calendar-caption-line-height: $kendo-calendar-caption-line-height, + $kendo-calendar-caption-font-weight: $kendo-calendar-caption-font-weight, + $kendo-calendar-week-number-font-size: $kendo-calendar-week-number-font-size, + $kendo-calendar-view-width: $kendo-calendar-view-width, + $kendo-calendar-view-height: $kendo-calendar-view-height, + $kendo-calendar-view-gap: $kendo-calendar-view-gap, + $kendo-calendar-weekend-bg: $kendo-calendar-weekend-bg, + $kendo-calendar-weekend-text: $kendo-calendar-weekend-text, + $kendo-calendar-today-style: $kendo-calendar-today-style, + $kendo-calendar-today-color: $kendo-calendar-today-color, + $kendo-calendar-week-number-bg: $kendo-calendar-week-number-bg, + $kendo-calendar-week-number-text: $kendo-calendar-week-number-text, + $kendo-calendar-other-month-bg: $kendo-calendar-other-month-bg, + $kendo-calendar-other-month-text: $kendo-calendar-other-month-text, + $kendo-calendar-cell-bg: $kendo-calendar-cell-bg, + $kendo-calendar-cell-text: $kendo-calendar-cell-text, + $kendo-calendar-cell-border: $kendo-calendar-cell-border, + $kendo-calendar-cell-gradient: $kendo-calendar-cell-gradient, + $kendo-calendar-cell-hover-bg: $kendo-calendar-cell-hover-bg, + $kendo-calendar-cell-hover-text: $kendo-calendar-cell-hover-text, + $kendo-calendar-cell-hover-border: $kendo-calendar-cell-hover-border, + $kendo-calendar-cell-hover-gradient: $kendo-calendar-cell-hover-gradient, + $kendo-calendar-cell-selected-bg: $kendo-calendar-cell-selected-bg, + $kendo-calendar-cell-selected-text: $kendo-calendar-cell-selected-text, + $kendo-calendar-cell-selected-border: $kendo-calendar-cell-selected-border, + $kendo-calendar-cell-selected-gradient: $kendo-calendar-cell-selected-gradient, + $kendo-calendar-cell-selected-hover-bg: $kendo-calendar-cell-selected-hover-bg, + $kendo-calendar-cell-selected-hover-text: $kendo-calendar-cell-selected-hover-text, + $kendo-calendar-cell-selected-hover-border: $kendo-calendar-cell-selected-hover-border, + $kendo-calendar-cell-selected-hover-gradient: $kendo-calendar-cell-selected-hover-gradient, + $kendo-calendar-cell-focus-shadow: $kendo-calendar-cell-focus-shadow, + $kendo-calendar-cell-selected-focus-shadow: $kendo-calendar-cell-selected-focus-shadow, + $kendo-calendar-navigation-width: $kendo-calendar-navigation-width, + $kendo-calendar-navigation-item-height: $kendo-calendar-navigation-item-height, + $kendo-calendar-navigation-bg: $kendo-calendar-navigation-bg, + $kendo-calendar-navigation-text: $kendo-calendar-navigation-text, + $kendo-calendar-navigation-border: $kendo-calendar-navigation-border, + $kendo-calendar-navigation-hover-text: $kendo-calendar-navigation-hover-text, + $kendo-infinite-calendar-header-padding-x: $kendo-infinite-calendar-header-padding-x, + $kendo-infinite-calendar-header-padding-y: $kendo-infinite-calendar-header-padding-y, + $kendo-infinite-calendar-view-padding-x: $kendo-infinite-calendar-view-padding-x, + $kendo-infinite-calendar-view-padding-y: $kendo-infinite-calendar-view-padding-y, + $kendo-infinite-calendar-view-height: $kendo-infinite-calendar-view-height, + $kendo-calendar-range-cell-border-radius: $kendo-calendar-range-cell-border-radius, + $kendo-calendar-sm-font-size: $kendo-calendar-sm-font-size, + $kendo-calendar-sm-line-height: $kendo-calendar-sm-line-height, + $kendo-calendar-sm-cell-size: $kendo-calendar-sm-cell-size, + $kendo-calendar-sm-cell-padding-x: $kendo-calendar-sm-cell-padding-x, + $kendo-calendar-sm-cell-padding-y: $kendo-calendar-sm-cell-padding-y, + $kendo-calendar-md-font-size: $kendo-calendar-md-font-size, + $kendo-calendar-md-line-height: $kendo-calendar-md-line-height, + $kendo-calendar-md-cell-size: $kendo-calendar-md-cell-size, + $kendo-calendar-md-cell-padding-x: $kendo-calendar-md-cell-padding-x, + $kendo-calendar-md-cell-padding-y: $kendo-calendar-md-cell-padding-y, + $kendo-calendar-lg-font-size: $kendo-calendar-lg-font-size, + $kendo-calendar-lg-line-height: $kendo-calendar-lg-line-height, + $kendo-calendar-lg-cell-size: $kendo-calendar-lg-cell-size, + $kendo-calendar-lg-cell-padding-x: $kendo-calendar-lg-cell-padding-x, + $kendo-calendar-lg-cell-padding-y: $kendo-calendar-lg-cell-padding-y, + $kendo-calendar-sizes: $kendo-calendar-sizes +); diff --git a/packages/bootstrap/scss/captcha/_index.scss b/packages/bootstrap/scss/captcha/_index.scss index c45664a3f5a..9e409a9997e 100644 --- a/packages/bootstrap/scss/captcha/_index.scss +++ b/packages/bootstrap/scss/captcha/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -15,8 +16,14 @@ // Expose -@mixin captcha-styles() { +@mixin kendo-captcha--styles() { @include import-once( "captcha" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-input--styles(); + @include kendo-button--styles(); + @include kendo-textbox--styles(); + @include kendo-slider--styles(); @include kendo-captcha--layout(); @include kendo-captcha--theme(); @include kendo-utils--typography--text-color(); diff --git a/packages/bootstrap/scss/captcha/_layout.scss b/packages/bootstrap/scss/captcha/_layout.scss index 40739700e5b..e420fdf24d9 100644 --- a/packages/bootstrap/scss/captcha/_layout.scss +++ b/packages/bootstrap/scss/captcha/_layout.scss @@ -1,6 +1,6 @@ -// @use "../core/" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/captcha/_layout.scss"; +@use "@progress/kendo-theme-default/scss/captcha/_layout.scss" as *; @mixin kendo-captcha--layout() { diff --git a/packages/bootstrap/scss/captcha/_theme.scss b/packages/bootstrap/scss/captcha/_theme.scss index 77073748118..d7cd3baef5a 100644 --- a/packages/bootstrap/scss/captcha/_theme.scss +++ b/packages/bootstrap/scss/captcha/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/captcha/_theme.scss"; +@use "@progress/kendo-theme-default/scss/captcha/_theme.scss" as *; @mixin kendo-captcha--theme() { diff --git a/packages/bootstrap/scss/captcha/_variables.scss b/packages/bootstrap/scss/captcha/_variables.scss index b96887098a9..fc36cd5ad89 100644 --- a/packages/bootstrap/scss/captcha/_variables.scss +++ b/packages/bootstrap/scss/captcha/_variables.scss @@ -48,3 +48,21 @@ $kendo-captcha-validation-message-font-size: var( --kendo-font-size-sm, inherit /// The font style of the Captcha validation message. /// @group captcha $kendo-captcha-validation-message-font-style: italic !default; + + +@forward "@progress/kendo-theme-default/scss/captcha/_variables.scss" with ( + $kendo-captcha-spacer: $kendo-captcha-spacer, + $kendo-captcha-width: $kendo-captcha-width, + $kendo-captcha-font-family: $kendo-captcha-font-family, + $kendo-captcha-font-size: $kendo-captcha-font-size, + $kendo-captcha-line-height: $kendo-captcha-line-height, + $kendo-captcha-gap: $kendo-captcha-gap, + $kendo-captcha-bg: $kendo-captcha-bg, + $kendo-captcha-text: $kendo-captcha-text, + $kendo-captcha-border: $kendo-captcha-border, + $kendo-captcha-image-wrap-gap: $kendo-captcha-image-wrap-gap, + $kendo-captcha-image-controls-gap: $kendo-captcha-image-controls-gap, + $kendo-captcha-validation-message-margin-top: $kendo-captcha-validation-message-margin-top, + $kendo-captcha-validation-message-font-size: $kendo-captcha-validation-message-font-size, + $kendo-captcha-validation-message-font-style: $kendo-captcha-validation-message-font-style +); diff --git a/packages/bootstrap/scss/card/_index.scss b/packages/bootstrap/scss/card/_index.scss index 789c531d2bb..71c005cbc01 100644 --- a/packages/bootstrap/scss/card/_index.scss +++ b/packages/bootstrap/scss/card/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -13,8 +14,12 @@ // Expose -@mixin card-styles() { +@mixin kendo-card--styles() { @include import-once( "card" ) { + @include core-styles(); + @include kendo-action-buttons--styles(); + @include kendo-icon--styles(); + @include typography--styles(); @include kendo-card--layout(); @include kendo-card--theme(); @include kendo-utils--typography--text-overflow(); diff --git a/packages/bootstrap/scss/card/_layout.scss b/packages/bootstrap/scss/card/_layout.scss index c0b333da744..70bcc58004c 100644 --- a/packages/bootstrap/scss/card/_layout.scss +++ b/packages/bootstrap/scss/card/_layout.scss @@ -1,7 +1,6 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@use "../typography/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/card/_layout.scss"; +@use "@progress/kendo-theme-default/scss/card/_layout.scss" as *; @mixin kendo-card--layout() { diff --git a/packages/bootstrap/scss/card/_theme.scss b/packages/bootstrap/scss/card/_theme.scss index e1175613ffa..f39b469a1ca 100644 --- a/packages/bootstrap/scss/card/_theme.scss +++ b/packages/bootstrap/scss/card/_theme.scss @@ -1,6 +1,5 @@ -@use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/card/_theme.scss"; +@use "@progress/kendo-theme-default/scss/card/_theme.scss" as *; @mixin kendo-card--theme() { diff --git a/packages/bootstrap/scss/card/_variables.scss b/packages/bootstrap/scss/card/_variables.scss index 1032e2c87f0..ec1cefa9e55 100644 --- a/packages/bootstrap/scss/card/_variables.scss +++ b/packages/bootstrap/scss/card/_variables.scss @@ -1,6 +1,8 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "../typography/_variables.scss" as *; @use "../button/_variables.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // Card @@ -184,3 +186,62 @@ $kendo-card-callout-width: 1.3em !default; /// The height of the Card callout. /// @group card $kendo-card-callout-height: 1.3em !default; + + +@forward "@progress/kendo-theme-default/scss/card/_variables.scss" with ( + $kendo-card-padding-x: $kendo-card-padding-x, + $kendo-card-padding-y: $kendo-card-padding-y, + $kendo-card-border-width: $kendo-card-border-width, + $kendo-card-border-radius: $kendo-card-border-radius, + $kendo-card-inner-border-radius: $kendo-card-inner-border-radius, + $kendo-card-font-family: $kendo-card-font-family, + $kendo-card-font-size: $kendo-card-font-size, + $kendo-card-line-height: $kendo-card-line-height, + $kendo-card-deck-gap: $kendo-card-deck-gap, + $kendo-card-bg: $kendo-card-bg, + $kendo-card-text: $kendo-card-text, + $kendo-card-border: $kendo-card-border, + $kendo-card-shadow: $kendo-card-shadow, + $kendo-card-focus-bg: $kendo-card-focus-bg, + $kendo-card-focus-text: $kendo-card-focus-text, + $kendo-card-focus-border: $kendo-card-focus-border, + $kendo-card-focus-shadow: $kendo-card-focus-shadow, + $kendo-card-header-padding-x: $kendo-card-header-padding-x, + $kendo-card-header-padding-y: $kendo-card-header-padding-y, + $kendo-card-header-border-width: $kendo-card-header-border-width, + $kendo-card-header-bg: $kendo-card-header-bg, + $kendo-card-header-text: $kendo-card-header-text, + $kendo-card-header-border: $kendo-card-header-border, + $kendo-card-body-padding-x: $kendo-card-body-padding-x, + $kendo-card-body-padding-y: $kendo-card-body-padding-y, + $kendo-card-footer-padding-x: $kendo-card-footer-padding-x, + $kendo-card-footer-padding-y: $kendo-card-footer-padding-y, + $kendo-card-footer-border-width: $kendo-card-footer-border-width, + $kendo-card-footer-bg: $kendo-card-footer-bg, + $kendo-card-footer-text: $kendo-card-footer-text, + $kendo-card-footer-border: $kendo-card-footer-border, + $kendo-card-title-margin-bottom: $kendo-card-title-margin-bottom, + $kendo-card-title-font-size: $kendo-card-title-font-size, + $kendo-card-title-font-family: $kendo-card-title-font-family, + $kendo-card-title-line-height: $kendo-card-title-line-height, + $kendo-card-title-font-weight: $kendo-card-title-font-weight, + $kendo-card-title-letter-spacing: $kendo-card-title-letter-spacing, + $kendo-card-subtitle-margin-bottom: $kendo-card-subtitle-margin-bottom, + $kendo-card-subtitle-font-size: $kendo-card-subtitle-font-size, + $kendo-card-subtitle-font-family: $kendo-card-subtitle-font-family, + $kendo-card-subtitle-line-height: $kendo-card-subtitle-line-height, + $kendo-card-subtitle-font-weight: $kendo-card-subtitle-font-weight, + $kendo-card-subtitle-letter-spacing: $kendo-card-subtitle-letter-spacing, + $kendo-card-subtitle-text: $kendo-card-subtitle-text, + $kendo-card-img-max-width: $kendo-card-img-max-width, + $kendo-card-avatar-size: $kendo-card-avatar-size, + $kendo-card-avatar-spacing: $kendo-card-avatar-spacing, + $kendo-card-actions-padding-x: $kendo-card-actions-padding-x, + $kendo-card-actions-padding-y: $kendo-card-actions-padding-y, + $kendo-card-actions-border-width: $kendo-card-actions-border-width, + $kendo-card-actions-gap: $kendo-card-actions-gap, + $kendo-card-deck-scroll-button-radius: $kendo-card-deck-scroll-button-radius, + $kendo-card-deck-scroll-button-offset: $kendo-card-deck-scroll-button-offset, + $kendo-card-callout-width: $kendo-card-callout-width, + $kendo-card-callout-height: $kendo-card-callout-height +); diff --git a/packages/bootstrap/scss/chart-wizard/_index.scss b/packages/bootstrap/scss/chart-wizard/_index.scss index ff07db09946..128c5718810 100644 --- a/packages/bootstrap/scss/chart-wizard/_index.scss +++ b/packages/bootstrap/scss/chart-wizard/_index.scss @@ -20,8 +20,19 @@ // Expose -@mixin chart-wizard-styles() { +@mixin kendo-chart-wizard--styles() { @include import-once( "chart-wizard" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-window--styles(); + @include kendo-splitter--styles(); + @include kendo-dataviz--styles(); + @include kendo-expander--styles(); + @include kendo-grid--styles(); + @include kendo-tabstrip--styles(); + @include kendo-listview--styles(); + @include kendo-form--styles(); + @include kendo-combobox--styles(); @include kendo-chart-wizard--layout(); @include kendo-chart-wizard--theme(); } diff --git a/packages/bootstrap/scss/chart-wizard/_layout.scss b/packages/bootstrap/scss/chart-wizard/_layout.scss index 91ff8b7e8b4..9584bafe726 100644 --- a/packages/bootstrap/scss/chart-wizard/_layout.scss +++ b/packages/bootstrap/scss/chart-wizard/_layout.scss @@ -1,6 +1,6 @@ @use "./variables.scss" as *; -@import "@progress/kendo-theme-default/scss/chart-wizard/_layout.scss"; +@use "@progress/kendo-theme-default/scss/chart-wizard/_layout.scss" as *; @mixin kendo-chart-wizard--layout() { @include kendo-chart-wizard--layout-base(); diff --git a/packages/bootstrap/scss/chart-wizard/_theme.scss b/packages/bootstrap/scss/chart-wizard/_theme.scss index b7b1ea02ae1..d6f4d724a4f 100644 --- a/packages/bootstrap/scss/chart-wizard/_theme.scss +++ b/packages/bootstrap/scss/chart-wizard/_theme.scss @@ -1,6 +1,6 @@ @use "./variables.scss" as *; -@import "@progress/kendo-theme-default/scss/chart-wizard/_theme.scss"; +@use "@progress/kendo-theme-default/scss/chart-wizard/_theme.scss" as *; @mixin kendo-chart-wizard--theme() { @include kendo-chart-wizard--theme-base(); diff --git a/packages/bootstrap/scss/chart-wizard/_variables.scss b/packages/bootstrap/scss/chart-wizard/_variables.scss index 18f6e7cf78d..58f33c4fa8c 100644 --- a/packages/bootstrap/scss/chart-wizard/_variables.scss +++ b/packages/bootstrap/scss/chart-wizard/_variables.scss @@ -39,3 +39,18 @@ $kendo-chart-wizard-chart-type-spacing: k-spacing(6) !default; /// The gap between the icon area and its text. /// @group chart-wizard $kendo-chart-wizard-icon-text-gap: k-spacing(3) !default; + + +@forward "@progress/kendo-theme-default/scss/chart-wizard/_variables.scss" with ( + $kendo-chart-wizard-icon-area-color: $kendo-chart-wizard-icon-area-color, + $kendo-chart-wizard-icon-area-bg: $kendo-chart-wizard-icon-area-bg, + $kendo-chart-wizard-icon-area-border-radius: $kendo-chart-wizard-icon-area-border-radius, + $kendo-chart-wizard-icon-area-padding: $kendo-chart-wizard-icon-area-padding, + $kendo-chart-wizard-icon-area-focus-shadow: $kendo-chart-wizard-icon-area-focus-shadow, + $kendo-chart-wizard-icon-area-selected-shadow: $kendo-chart-wizard-icon-area-selected-shadow, + $kendo-chart-wizard-chart-type-selected-color: $kendo-chart-wizard-chart-type-selected-color, + $kendo-chart-wizard-preview-pane-padding: $kendo-chart-wizard-preview-pane-padding, + $kendo-chart-wizard-property-pane-padding: $kendo-chart-wizard-property-pane-padding, + $kendo-chart-wizard-chart-type-spacing: $kendo-chart-wizard-chart-type-spacing, + $kendo-chart-wizard-icon-text-gap: $kendo-chart-wizard-icon-text-gap +); diff --git a/packages/bootstrap/scss/chat/_index.scss b/packages/bootstrap/scss/chat/_index.scss index 6cf982f08a5..4bc191b66af 100644 --- a/packages/bootstrap/scss/chat/_index.scss +++ b/packages/bootstrap/scss/chat/_index.scss @@ -13,8 +13,13 @@ // Expose -@mixin chat-styles() { +@mixin kendo-chat--styles() { @include import-once( "chat" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-card--styles(); + @include kendo-icon--styles(); + @include kendo-toolbar--styles(); @include kendo-chat--layout(); @include kendo-chat--theme(); } diff --git a/packages/bootstrap/scss/chat/_layout.scss b/packages/bootstrap/scss/chat/_layout.scss index e80b8b8d3de..98c65d084d7 100644 --- a/packages/bootstrap/scss/chat/_layout.scss +++ b/packages/bootstrap/scss/chat/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../toolbar/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/chat/_layout.scss"; +@use "@progress/kendo-theme-default/scss/chat/_layout.scss" as *; @mixin kendo-chat--layout() { diff --git a/packages/bootstrap/scss/chat/_theme.scss b/packages/bootstrap/scss/chat/_theme.scss index c26a6af1445..790060f3802 100644 --- a/packages/bootstrap/scss/chat/_theme.scss +++ b/packages/bootstrap/scss/chat/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/chat/_theme.scss"; +@use "@progress/kendo-theme-default/scss/chat/_theme.scss" as *; @mixin kendo-chat--theme() { diff --git a/packages/bootstrap/scss/chat/_variables.scss b/packages/bootstrap/scss/chat/_variables.scss index 2e84e3ae659..1cb75c59ef9 100644 --- a/packages/bootstrap/scss/chat/_variables.scss +++ b/packages/bootstrap/scss/chat/_variables.scss @@ -1,5 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "../button/_variables.scss" as *; @use "../toolbar/_variables.scss" as *; // Chat @@ -213,3 +214,71 @@ $kendo-chat-quick-reply-shadow-spread: .25rem !default; /// The shadow opacity of the focused Chat quick reply. /// @group chat $kendo-chat-quick-reply-shadow-opacity: .5 !default; + + +@forward "@progress/kendo-theme-default/scss/chat/_variables.scss" with ( + $kendo-chat-padding-x: $kendo-chat-padding-x, + $kendo-chat-padding-y: $kendo-chat-padding-y, + $kendo-chat-width: $kendo-chat-width, + $kendo-chat-height: $kendo-chat-height, + $kendo-chat-border-width: $kendo-chat-border-width, + $kendo-chat-font-family: $kendo-chat-font-family, + $kendo-chat-font-size: $kendo-chat-font-size, + $kendo-chat-line-height: $kendo-chat-line-height, + $kendo-chat-item-spacing-x: $kendo-chat-item-spacing-x, + $kendo-chat-item-spacing-y: $kendo-chat-item-spacing-y, + $kendo-chat-message-list-padding-x: $kendo-chat-message-list-padding-x, + $kendo-chat-message-list-padding-y: $kendo-chat-message-list-padding-y, + $kendo-chat-message-list-spacing: $kendo-chat-message-list-spacing, + $kendo-chat-timestamp-font-size: $kendo-chat-timestamp-font-size, + $kendo-chat-timestamp-line-height: $kendo-chat-timestamp-line-height, + $kendo-chat-timestamp-transform: $kendo-chat-timestamp-transform, + $kendo-chat-timestamp-text: $kendo-chat-timestamp-text, + $kendo-chat-timestamp-bg: $kendo-chat-timestamp-bg, + $kendo-chat-message-meta-font-size: $kendo-chat-message-meta-font-size, + $kendo-chat-message-meta-line-height: $kendo-chat-message-meta-line-height, + $kendo-chat-author-font-size: $kendo-chat-author-font-size, + $kendo-chat-author-line-height: $kendo-chat-author-line-height, + $kendo-chat-bubble-padding-x: $kendo-chat-bubble-padding-x, + $kendo-chat-bubble-padding-y: $kendo-chat-bubble-padding-y, + $kendo-chat-bubble-spacing: $kendo-chat-bubble-spacing, + $kendo-chat-bubble-line-height: $kendo-chat-bubble-line-height, + $kendo-chat-bubble-border-radius: $kendo-chat-bubble-border-radius, + $kendo-chat-bubble-border-radius-sm: $kendo-chat-bubble-border-radius-sm, + $kendo-chat-avatar-size: $kendo-chat-avatar-size, + $kendo-chat-avatar-spacing: $kendo-chat-avatar-spacing, + $kendo-chat-toolbar-padding-x: $kendo-chat-toolbar-padding-x, + $kendo-chat-toolbar-padding-y: $kendo-chat-toolbar-padding-y, + $kendo-chat-toolbar-spacing: $kendo-chat-toolbar-spacing, + $kendo-chat-toolbar-bg: $kendo-chat-toolbar-bg, + $kendo-chat-toolbar-text: $kendo-chat-toolbar-text, + $kendo-chat-toolbar-border: $kendo-chat-toolbar-border, + $kendo-chat-quick-reply-padding-x: $kendo-chat-quick-reply-padding-x, + $kendo-chat-quick-reply-padding-y: $kendo-chat-quick-reply-padding-y, + $kendo-chat-quick-reply-spacing: $kendo-chat-quick-reply-spacing, + $kendo-chat-quick-reply-line-height: $kendo-chat-quick-reply-line-height, + $kendo-chat-bg: $kendo-chat-bg, + $kendo-chat-text: $kendo-chat-text, + $kendo-chat-border: $kendo-chat-border, + $kendo-chat-bubble-bg: $kendo-chat-bubble-bg, + $kendo-chat-bubble-text: $kendo-chat-bubble-text, + $kendo-chat-bubble-border: $kendo-chat-bubble-border, + $kendo-chat-bubble-shadow: $kendo-chat-bubble-shadow, + $kendo-chat-bubble-hover-shadow: $kendo-chat-bubble-hover-shadow, + $kendo-chat-bubble-selected-shadow: $kendo-chat-bubble-selected-shadow, + $kendo-chat-alt-bubble-bg: $kendo-chat-alt-bubble-bg, + $kendo-chat-alt-bubble-text: $kendo-chat-alt-bubble-text, + $kendo-chat-alt-bubble-border: $kendo-chat-alt-bubble-border, + $kendo-chat-alt-bubble-shadow: $kendo-chat-alt-bubble-shadow, + $kendo-chat-alt-bubble-hover-shadow: $kendo-chat-alt-bubble-hover-shadow, + $kendo-chat-alt-bubble-selected-shadow: $kendo-chat-alt-bubble-selected-shadow, + $kendo-chat-quick-reply-bg: $kendo-chat-quick-reply-bg, + $kendo-chat-quick-reply-text: $kendo-chat-quick-reply-text, + $kendo-chat-quick-reply-border: $kendo-chat-quick-reply-border, + $kendo-chat-quick-reply-hover-bg: $kendo-chat-quick-reply-hover-bg, + $kendo-chat-quick-reply-hover-text: $kendo-chat-quick-reply-hover-text, + $kendo-chat-quick-reply-hover-border: $kendo-chat-quick-reply-hover-border, + $kendo-chat-quick-reply-shadow-blur: $kendo-chat-quick-reply-shadow-blur, + $kendo-chat-quick-reply-shadow-spread: $kendo-chat-quick-reply-shadow-spread, + $kendo-chat-quick-reply-shadow-opacity: $kendo-chat-quick-reply-shadow-opacity +); diff --git a/packages/bootstrap/scss/checkbox/_index.scss b/packages/bootstrap/scss/checkbox/_index.scss index 8a76acf5c41..70cd5408df5 100644 --- a/packages/bootstrap/scss/checkbox/_index.scss +++ b/packages/bootstrap/scss/checkbox/_index.scss @@ -9,8 +9,9 @@ // Expose -@mixin checkbox-styles() { +@mixin kendo-checkbox--styles() { @include import-once( "checkbox" ) { + @include core-styles(); @include kendo-checkbox--layout(); @include kendo-checkbox--theme(); } diff --git a/packages/bootstrap/scss/checkbox/_layout.scss b/packages/bootstrap/scss/checkbox/_layout.scss index ff90dadb5b5..758031d654f 100644 --- a/packages/bootstrap/scss/checkbox/_layout.scss +++ b/packages/bootstrap/scss/checkbox/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/checkbox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/checkbox/_layout.scss" as *; @mixin kendo-checkbox--layout() { diff --git a/packages/bootstrap/scss/checkbox/_theme.scss b/packages/bootstrap/scss/checkbox/_theme.scss index 03887d667c4..9a7dfd2bc03 100644 --- a/packages/bootstrap/scss/checkbox/_theme.scss +++ b/packages/bootstrap/scss/checkbox/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/checkbox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/checkbox/_theme.scss" as *; @mixin kendo-checkbox--theme() { diff --git a/packages/bootstrap/scss/checkbox/_variables.scss b/packages/bootstrap/scss/checkbox/_variables.scss index 0ab25f80ccf..d446ecb83d6 100644 --- a/packages/bootstrap/scss/checkbox/_variables.scss +++ b/packages/bootstrap/scss/checkbox/_variables.scss @@ -194,3 +194,55 @@ $kendo-checkbox-ripple-bg: $kendo-checkbox-checked-bg !default; /// The opacity of the CheckBox' ripple. /// @group checkbox $kendo-checkbox-ripple-opacity: .25 !default; + + +@forward "@progress/kendo-theme-default/scss/checkbox/_variables.scss" with ( + $kendo-checkbox-border-width: $kendo-checkbox-border-width, + $kendo-checkbox-sm-size: $kendo-checkbox-sm-size, + $kendo-checkbox-md-size: $kendo-checkbox-md-size, + $kendo-checkbox-lg-size: $kendo-checkbox-lg-size, + $kendo-checkbox-sm-glyph-size: $kendo-checkbox-sm-glyph-size, + $kendo-checkbox-md-glyph-size: $kendo-checkbox-md-glyph-size, + $kendo-checkbox-lg-glyph-size: $kendo-checkbox-lg-glyph-size, + $kendo-checkbox-sm-ripple-size: $kendo-checkbox-sm-ripple-size, + $kendo-checkbox-md-ripple-size: $kendo-checkbox-md-ripple-size, + $kendo-checkbox-lg-ripple-size: $kendo-checkbox-lg-ripple-size, + $kendo-checkbox-sizes: $kendo-checkbox-sizes, + $kendo-checkbox-bg: $kendo-checkbox-bg, + $kendo-checkbox-text: $kendo-checkbox-text, + $kendo-checkbox-border: $kendo-checkbox-border, + $kendo-checkbox-hover-bg: $kendo-checkbox-hover-bg, + $kendo-checkbox-hover-text: $kendo-checkbox-hover-text, + $kendo-checkbox-hover-border: $kendo-checkbox-hover-border, + $kendo-checkbox-checked-bg: $kendo-checkbox-checked-bg, + $kendo-checkbox-checked-text: $kendo-checkbox-checked-text, + $kendo-checkbox-checked-border: $kendo-checkbox-checked-border, + $kendo-checkbox-indeterminate-bg: $kendo-checkbox-indeterminate-bg, + $kendo-checkbox-indeterminate-text: $kendo-checkbox-indeterminate-text, + $kendo-checkbox-indeterminate-border: $kendo-checkbox-indeterminate-border, + $kendo-checkbox-focus-border: $kendo-checkbox-focus-border, + $kendo-checkbox-focus-shadow: $kendo-checkbox-focus-shadow, + $kendo-checkbox-focus-checked-border: $kendo-checkbox-focus-checked-border, + $kendo-checkbox-focus-checked-shadow: $kendo-checkbox-focus-checked-shadow, + $kendo-checkbox-disabled-bg: $kendo-checkbox-disabled-bg, + $kendo-checkbox-disabled-text: $kendo-checkbox-disabled-text, + $kendo-checkbox-disabled-border: $kendo-checkbox-disabled-border, + $kendo-checkbox-disabled-checked-bg: $kendo-checkbox-disabled-checked-bg, + $kendo-checkbox-disabled-checked-text: $kendo-checkbox-disabled-checked-text, + $kendo-checkbox-disabled-checked-border: $kendo-checkbox-disabled-checked-border, + $kendo-checkbox-invalid-bg: $kendo-checkbox-invalid-bg, + $kendo-checkbox-invalid-text: $kendo-checkbox-invalid-text, + $kendo-checkbox-invalid-border: $kendo-checkbox-invalid-border, + $kendo-checkbox-indicator-type: $kendo-checkbox-indicator-type, + $kendo-checkbox-glyph-font-family: $kendo-checkbox-glyph-font-family, + $kendo-checkbox-checked-glyph: $kendo-checkbox-checked-glyph, + $kendo-checkbox-indeterminate-glyph: $kendo-checkbox-indeterminate-glyph, + $kendo-checkbox-checked-image: $kendo-checkbox-checked-image, + $kendo-checkbox-indeterminate-image: $kendo-checkbox-indeterminate-image, + $kendo-checkbox-label-margin-x: $kendo-checkbox-label-margin-x, + $kendo-checkbox-list-spacing: $kendo-checkbox-list-spacing, + $kendo-checkbox-list-item-padding-x: $kendo-checkbox-list-item-padding-x, + $kendo-checkbox-list-item-padding-y: $kendo-checkbox-list-item-padding-y, + $kendo-checkbox-ripple-bg: $kendo-checkbox-ripple-bg, + $kendo-checkbox-ripple-opacity: $kendo-checkbox-ripple-opacity +); diff --git a/packages/bootstrap/scss/chip/_index.scss b/packages/bootstrap/scss/chip/_index.scss index 0fad687b369..f8a606a9844 100644 --- a/packages/bootstrap/scss/chip/_index.scss +++ b/packages/bootstrap/scss/chip/_index.scss @@ -11,8 +11,10 @@ // Expose -@mixin chip-styles() { +@mixin kendo-chip--styles() { @include import-once( "chip" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-chip--layout(); @include kendo-chip--theme(); @include kendo-utils--typography--text-overflow(); diff --git a/packages/bootstrap/scss/chip/_layout.scss b/packages/bootstrap/scss/chip/_layout.scss index 7fc093bd054..a790be05c86 100644 --- a/packages/bootstrap/scss/chip/_layout.scss +++ b/packages/bootstrap/scss/chip/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/chip/_layout.scss"; +@use "@progress/kendo-theme-default/scss/chip/_layout.scss" as *; @mixin kendo-chip--layout() { diff --git a/packages/bootstrap/scss/chip/_theme.scss b/packages/bootstrap/scss/chip/_theme.scss index c3740e3eacd..2c975122ecb 100644 --- a/packages/bootstrap/scss/chip/_theme.scss +++ b/packages/bootstrap/scss/chip/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/chip/_theme.scss"; +@use "@progress/kendo-theme-default/scss/chip/_theme.scss" as *; @mixin kendo-chip--theme() { diff --git a/packages/bootstrap/scss/chip/_variables.scss b/packages/bootstrap/scss/chip/_variables.scss index f381981096f..5cbd1df3e7c 100644 --- a/packages/bootstrap/scss/chip/_variables.scss +++ b/packages/bootstrap/scss/chip/_variables.scss @@ -101,10 +101,10 @@ $kendo-chip-base-bg: $kendo-button-bg !default; /// @group chip $kendo-chip-theme-colors: ( "base": $kendo-chip-base-bg, - "error": k-map-get( $kendo-theme-colors, "error" ), - "info": k-map-get( $kendo-theme-colors, "info" ), - "warning": k-map-get( $kendo-theme-colors, "warning" ), - "success": k-map-get( $kendo-theme-colors, "success" ) + "error": map.get( $kendo-theme-colors, "error" ), + "info": map.get( $kendo-theme-colors, "info" ), + "warning": map.get( $kendo-theme-colors, "warning" ), + "success": map.get( $kendo-theme-colors, "success" ) ) !default; /// The base background color of the solid Chip. @@ -180,3 +180,50 @@ $kendo-chip-list-sizes: ( md: k-spacing(1), lg: k-spacing(1) ) !default; + + +@forward "@progress/kendo-theme-default/scss/chip/_variables.scss" with ( + $kendo-chip-border-width: $kendo-chip-border-width, + $kendo-chip-spacing: $kendo-chip-spacing, + $kendo-chip-padding-x: $kendo-chip-padding-x, + $kendo-chip-sm-padding-x: $kendo-chip-sm-padding-x, + $kendo-chip-md-padding-x: $kendo-chip-md-padding-x, + $kendo-chip-lg-padding-x: $kendo-chip-lg-padding-x, + $kendo-chip-padding-y: $kendo-chip-padding-y, + $kendo-chip-sm-padding-y: $kendo-chip-sm-padding-y, + $kendo-chip-md-padding-y: $kendo-chip-md-padding-y, + $kendo-chip-lg-padding-y: $kendo-chip-lg-padding-y, + $kendo-chip-font-size: $kendo-chip-font-size, + $kendo-chip-sm-font-size: $kendo-chip-sm-font-size, + $kendo-chip-md-font-size: $kendo-chip-md-font-size, + $kendo-chip-lg-font-size: $kendo-chip-lg-font-size, + $kendo-chip-line-height: $kendo-chip-line-height, + $kendo-chip-sm-line-height: $kendo-chip-sm-line-height, + $kendo-chip-md-line-height: $kendo-chip-md-line-height, + $kendo-chip-lg-line-height: $kendo-chip-lg-line-height, + $kendo-chip-calc-size: $kendo-chip-calc-size, + $kendo-chip-sm-calc-size: $kendo-chip-sm-calc-size, + $kendo-chip-sizes: $kendo-chip-sizes, + $kendo-chip-base-bg: $kendo-chip-base-bg, + $kendo-chip-theme-colors: $kendo-chip-theme-colors, + $kendo-chip-solid-bg: $kendo-chip-solid-bg, + $kendo-chip-solid-text: $kendo-chip-solid-text, + $kendo-chip-solid-border: $kendo-chip-solid-border, + $kendo-chip-solid-shadow: $kendo-chip-solid-shadow, + $kendo-chip-solid-gradient: $kendo-chip-solid-gradient, + $kendo-chip-solid-focus-bg: $kendo-chip-solid-focus-bg, + $kendo-chip-solid-focus-text: $kendo-chip-solid-focus-text, + $kendo-chip-solid-hover-bg: $kendo-chip-solid-hover-bg, + $kendo-chip-solid-hover-text: $kendo-chip-solid-hover-text, + $kendo-chip-solid-selected-bg: $kendo-chip-solid-selected-bg, + $kendo-chip-solid-selected-text: $kendo-chip-solid-selected-text, + $kendo-chip-outline-bg: $kendo-chip-outline-bg, + $kendo-chip-outline-text: $kendo-chip-outline-text, + $kendo-chip-outline-border: $kendo-chip-outline-border, + $kendo-chip-outline-shadow: $kendo-chip-outline-shadow, + $kendo-chip-outline-hover-bg: $kendo-chip-outline-hover-bg, + $kendo-chip-outline-hover-text: $kendo-chip-outline-hover-text, + $kendo-chip-outline-selected-bg: $kendo-chip-outline-selected-bg, + $kendo-chip-outline-selected-text: $kendo-chip-outline-selected-text, + $kendo-chip-list-sizes: $kendo-chip-list-sizes +); diff --git a/packages/bootstrap/scss/color-preview/_index.scss b/packages/bootstrap/scss/color-preview/_index.scss index e7091713290..fbd8d3628e8 100644 --- a/packages/bootstrap/scss/color-preview/_index.scss +++ b/packages/bootstrap/scss/color-preview/_index.scss @@ -6,15 +6,12 @@ // Dependencies @use "../core/_index.scss" as *; -@use "../action-buttons/_index.scss" as *; -@use "../color-preview/_index.scss" as *; -@use "../colorpalette/_index.scss" as *; -@use "../colorgradient/_index.scss" as *; // Expose -@mixin color-preview-styles() { +@mixin kendo-color-preview--styles() { @include import-once( "color-preview" ) { + @include core-styles(); @include kendo-color-preview--layout(); @include kendo-color-preview--theme(); } diff --git a/packages/bootstrap/scss/color-preview/_layout.scss b/packages/bootstrap/scss/color-preview/_layout.scss index 7f14a878958..76ad90f8791 100644 --- a/packages/bootstrap/scss/color-preview/_layout.scss +++ b/packages/bootstrap/scss/color-preview/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/color-preview/_layout.scss"; +@use "@progress/kendo-theme-default/scss/color-preview/_layout.scss" as *; @mixin kendo-color-preview--layout() { diff --git a/packages/bootstrap/scss/color-preview/_theme.scss b/packages/bootstrap/scss/color-preview/_theme.scss index 5b350ba3944..f021d4aa3fb 100644 --- a/packages/bootstrap/scss/color-preview/_theme.scss +++ b/packages/bootstrap/scss/color-preview/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/color-preview/_theme.scss"; +@use "@progress/kendo-theme-default/scss/color-preview/_theme.scss" as *; @mixin kendo-color-preview--theme() { diff --git a/packages/bootstrap/scss/color-preview/_variables.scss b/packages/bootstrap/scss/color-preview/_variables.scss index 38f27a630b5..93d3dc73a7e 100644 --- a/packages/bootstrap/scss/color-preview/_variables.scss +++ b/packages/bootstrap/scss/color-preview/_variables.scss @@ -15,3 +15,18 @@ $kendo-color-preview-no-color-border: null !default; $kendo-color-preview-no-color-image: k-escape-svg( url("data:image/svg+xml,") ) !default; $kendo-color-preview-transparent-color-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAuSURBVHgBxYyxDQAwDMJIL+YT+DjtzFRliUfLcklqBCRT4eCTxbD6kdL2/LgYXqpvCbs3kBv/AAAAAElFTkSuQmCC") !default; + + +@forward "@progress/kendo-theme-default/scss/color-preview/_variables.scss" with ( + $kendo-color-preview-border-radius: $kendo-color-preview-border-radius, + $kendo-color-preview-border-width: $kendo-color-preview-border-width, + $kendo-color-preview-bg: $kendo-color-preview-bg, + $kendo-color-preview-text: $kendo-color-preview-text, + $kendo-color-preview-border: $kendo-color-preview-border, + $kendo-color-preview-hover-border: $kendo-color-preview-hover-border, + $kendo-color-preview-no-color-bg: $kendo-color-preview-no-color-bg, + $kendo-color-preview-no-color-text: $kendo-color-preview-no-color-text, + $kendo-color-preview-no-color-border: $kendo-color-preview-no-color-border, + $kendo-color-preview-no-color-image: $kendo-color-preview-no-color-image, + $kendo-color-preview-transparent-color-image: $kendo-color-preview-transparent-color-image +); diff --git a/packages/bootstrap/scss/coloreditor/_index.scss b/packages/bootstrap/scss/coloreditor/_index.scss index 953bb395ed2..0d2796ee653 100644 --- a/packages/bootstrap/scss/coloreditor/_index.scss +++ b/packages/bootstrap/scss/coloreditor/_index.scss @@ -1,30 +1,25 @@ -// Module meta -$_kendo-module-meta: ( - name: "color-editor", - dependencies: ( - "button", - "action-buttons", - "colorgradient", - "colorpalette", - "colorpreview" - ) -); - - // Component @forward "./_variables.scss"; @use "./_layout.scss" as *; @use "./_theme.scss" as *; -// Register -@use "../core/module-system/index.scss" as module; -@include module.register( $_kendo-module-meta... ); +// Dependencies +@use "../core/_index.scss" as *; +@use "../action-buttons/_index.scss" as *; +@use "../color-preview/_index.scss" as *; +@use "../colorpalette/_index.scss" as *; +@use "../colorgradient/_index.scss" as *; // Expose -@mixin color-editor-styles() { +@mixin kendo-color-editor--styles() { @include import-once( "color-editor" ) { + @include core-styles(); + @include kendo-action-buttons--styles(); + @include kendo-color-preview--styles(); + @include kendo-color-palette--styles(); + @include kendo-color-gradient--styles(); @include kendo-color-editor--layout(); @include kendo-color-editor--theme(); } diff --git a/packages/bootstrap/scss/coloreditor/_layout.scss b/packages/bootstrap/scss/coloreditor/_layout.scss index 25f56311941..9cca3ac04a3 100644 --- a/packages/bootstrap/scss/coloreditor/_layout.scss +++ b/packages/bootstrap/scss/coloreditor/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../colorpalette/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/coloreditor/_layout.scss"; +@use "@progress/kendo-theme-default/scss/coloreditor/_layout.scss" as *; @mixin kendo-color-editor--layout() { diff --git a/packages/bootstrap/scss/coloreditor/_theme.scss b/packages/bootstrap/scss/coloreditor/_theme.scss index 1f7431c6762..b6178557cc9 100644 --- a/packages/bootstrap/scss/coloreditor/_theme.scss +++ b/packages/bootstrap/scss/coloreditor/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/coloreditor/_theme.scss"; +@use "@progress/kendo-theme-default/scss/coloreditor/_theme.scss" as *; @mixin kendo-color-editor--theme() { diff --git a/packages/bootstrap/scss/coloreditor/_variables.scss b/packages/bootstrap/scss/coloreditor/_variables.scss index 3dfec237d32..49bdae24f3f 100644 --- a/packages/bootstrap/scss/coloreditor/_variables.scss +++ b/packages/bootstrap/scss/coloreditor/_variables.scss @@ -81,3 +81,31 @@ $kendo-color-editor-color-gradient-focus-outline: 2px !default; /// The outline offset of the focused ColorGradient. /// @group color-editor $kendo-color-editor-color-gradient-focus-outline-offset: 2px !default; + + +@forward "@progress/kendo-theme-default/scss/coloreditor/_variables.scss" with ( + $kendo-color-editor-spacer: $kendo-color-editor-spacer, + $kendo-color-editor-min-width: $kendo-color-editor-min-width, + $kendo-color-editor-border-width: $kendo-color-editor-border-width, + $kendo-color-editor-border-radius: $kendo-color-editor-border-radius, + $kendo-color-editor-font-family: $kendo-color-editor-font-family, + $kendo-color-editor-font-size: $kendo-color-editor-font-size, + $kendo-color-editor-line-height: $kendo-color-editor-line-height, + $kendo-color-editor-text: $kendo-color-editor-text, + $kendo-color-editor-bg: $kendo-color-editor-bg, + $kendo-color-editor-border: $kendo-color-editor-border, + $kendo-color-editor-focus-border: $kendo-color-editor-focus-border, + $kendo-color-editor-focus-shadow: $kendo-color-editor-focus-shadow, + $kendo-color-editor-header-padding-y: $kendo-color-editor-header-padding-y, + $kendo-color-editor-header-padding-x: $kendo-color-editor-header-padding-x, + $kendo-color-editor-header-actions-gap: $kendo-color-editor-header-actions-gap, + $kendo-color-editor-color-preview-width: $kendo-color-editor-color-preview-width, + $kendo-color-editor-color-preview-height: $kendo-color-editor-color-preview-height, + $kendo-color-editor-preview-gap: $kendo-color-editor-preview-gap, + $kendo-color-editor-views-padding-y: $kendo-color-editor-views-padding-y, + $kendo-color-editor-views-padding-x: $kendo-color-editor-views-padding-x, + $kendo-color-editor-views-gap: $kendo-color-editor-views-gap, + $kendo-color-editor-color-gradient-focus-outline-color: $kendo-color-editor-color-gradient-focus-outline-color, + $kendo-color-editor-color-gradient-focus-outline: $kendo-color-editor-color-gradient-focus-outline, + $kendo-color-editor-color-gradient-focus-outline-offset: $kendo-color-editor-color-gradient-focus-outline-offset +); diff --git a/packages/bootstrap/scss/colorgradient/_index.scss b/packages/bootstrap/scss/colorgradient/_index.scss index 473a5b9f7a7..9413edd6b7e 100644 --- a/packages/bootstrap/scss/colorgradient/_index.scss +++ b/packages/bootstrap/scss/colorgradient/_index.scss @@ -15,8 +15,14 @@ // Expose -@mixin color-gradient-styles() { +@mixin kendo-color-gradient--styles() { @include import-once( "color-gradient" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-button--styles(); + @include kendo-slider--styles(); + @include kendo-textbox--styles(); + @include kendo-numeric-textbox--styles(); @include kendo-color-gradient--layout(); @include kendo-color-gradient--theme(); @include kendo-utils--flex-grid--flex(); diff --git a/packages/bootstrap/scss/colorgradient/_layout.scss b/packages/bootstrap/scss/colorgradient/_layout.scss index 9a4861b15fb..6b991a28dc3 100644 --- a/packages/bootstrap/scss/colorgradient/_layout.scss +++ b/packages/bootstrap/scss/colorgradient/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/colorgradient/_layout.scss"; +@use "@progress/kendo-theme-default/scss/colorgradient/_layout.scss" as *; @mixin kendo-color-gradient--layout() { diff --git a/packages/bootstrap/scss/colorgradient/_theme.scss b/packages/bootstrap/scss/colorgradient/_theme.scss index fedcf93a461..9481042c9c6 100644 --- a/packages/bootstrap/scss/colorgradient/_theme.scss +++ b/packages/bootstrap/scss/colorgradient/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/colorgradient/_theme.scss"; +@use "@progress/kendo-theme-default/scss/colorgradient/_theme.scss" as *; @mixin kendo-color-gradient--theme() { diff --git a/packages/bootstrap/scss/colorgradient/_variables.scss b/packages/bootstrap/scss/colorgradient/_variables.scss index 71cd90fedbc..c5b4d03c344 100644 --- a/packages/bootstrap/scss/colorgradient/_variables.scss +++ b/packages/bootstrap/scss/colorgradient/_variables.scss @@ -107,7 +107,7 @@ $kendo-color-gradient-draghandle-bg: transparent !default; $kendo-color-gradient-draghandle-border: rgba( $kendo-color-white, .8) !default; /// The color of the outline around the ColorGradient canvas drag handle. /// @group color-gradient -$kendo-color-gradient-draghandle-shadow: rgba( $kendo-color-black, .5) !default; +// $kendo-color-gradient-draghandle-shadow: rgba( $kendo-color-black, .5) !default; /// The focus color of the outline around the ColorGradient canvas drag handle. /// @group color-gradient $kendo-color-gradient-draghandle-focus-shadow: $kendo-color-black !default; @@ -144,3 +144,51 @@ $kendo-color-gradient-contrast-ratio-font-weight: var( --kendo-font-weight-bold, /// The spacing between the items in the ColorGradient contrast tool. /// @group color-gradient $kendo-color-gradient-contrast-spacer: calc( #{$kendo-color-gradient-spacer} / 2 ) !default; + + +@forward "@progress/kendo-theme-default/scss/colorgradient/_variables.scss" with ( + $kendo-color-gradient-spacer: $kendo-color-gradient-spacer, + $kendo-color-gradient-width: $kendo-color-gradient-width, + $kendo-color-gradient-border-width: $kendo-color-gradient-border-width, + $kendo-color-gradient-border-radius: $kendo-color-gradient-border-radius, + $kendo-color-gradient-padding-y: $kendo-color-gradient-padding-y, + $kendo-color-gradient-padding-x: $kendo-color-gradient-padding-x, + $kendo-color-gradient-gap: $kendo-color-gradient-gap, + $kendo-color-gradient-font-family: $kendo-color-gradient-font-family, + $kendo-color-gradient-font-size: $kendo-color-gradient-font-size, + $kendo-color-gradient-line-height: $kendo-color-gradient-line-height, + $kendo-color-gradient-text: $kendo-color-gradient-text, + $kendo-color-gradient-bg: $kendo-color-gradient-bg, + $kendo-color-gradient-border: $kendo-color-gradient-border, + $kendo-color-gradient-focus-border: $kendo-color-gradient-focus-border, + $kendo-color-gradient-focus-shadow: $kendo-color-gradient-focus-shadow, + $kendo-color-gradient-canvas-border-radius: $kendo-color-gradient-canvas-border-radius, + $kendo-color-gradient-canvas-gap: $kendo-color-gradient-canvas-gap, + $kendo-color-gradient-canvas-rectangle-height: $kendo-color-gradient-canvas-rectangle-height, + $kendo-color-gradient-slider-track-size: $kendo-color-gradient-slider-track-size, + $kendo-color-gradient-slider-border-radius: $kendo-color-gradient-slider-border-radius, + $kendo-color-gradient-slider-draghandle-border-width: $kendo-color-gradient-slider-draghandle-border-width, + $kendo-color-gradient-slider-vertical-size: $kendo-color-gradient-slider-vertical-size, + $kendo-color-gradient-slider-horizontal-size: $kendo-color-gradient-slider-horizontal-size, + $kendo-color-gradient-slider-alpha-bgr: $kendo-color-gradient-slider-alpha-bgr, + $kendo-color-gradient-draghandle-width: $kendo-color-gradient-draghandle-width, + $kendo-color-gradient-draghandle-height: $kendo-color-gradient-draghandle-height, + $kendo-color-gradient-draghandle-border-width: $kendo-color-gradient-draghandle-border-width, + $kendo-color-gradient-draghandle-outline-width: $kendo-color-gradient-draghandle-outline-width, + $kendo-color-gradient-draghandle-border-radius: $kendo-color-gradient-draghandle-border-radius, + $kendo-color-gradient-draghandle-text: $kendo-color-gradient-draghandle-text, + $kendo-color-gradient-draghandle-bg: $kendo-color-gradient-draghandle-bg, + $kendo-color-gradient-draghandle-border: $kendo-color-gradient-draghandle-border, + // $kendo-color-gradient-draghandle-shadow: $kendo-color-gradient-draghandle-shadow, + $kendo-color-gradient-draghandle-focus-shadow: $kendo-color-gradient-draghandle-focus-shadow, + $kendo-color-gradient-draghandle-hover-shadow: $kendo-color-gradient-draghandle-hover-shadow, + $kendo-color-gradient-draghandle-shadow: $kendo-color-gradient-draghandle-shadow, + $kendo-color-gradient-canvas-draghandle-margin-y: $kendo-color-gradient-canvas-draghandle-margin-y, + $kendo-color-gradient-canvas-draghandle-margin-x: $kendo-color-gradient-canvas-draghandle-margin-x, + $kendo-color-gradient-input-width: $kendo-color-gradient-input-width, + $kendo-color-gradient-input-gap: $kendo-color-gradient-input-gap, + $kendo-color-gradient-input-label-gap: $kendo-color-gradient-input-label-gap, + $kendo-color-gradient-input-label-text: $kendo-color-gradient-input-label-text, + $kendo-color-gradient-contrast-ratio-font-weight: $kendo-color-gradient-contrast-ratio-font-weight, + $kendo-color-gradient-contrast-spacer: $kendo-color-gradient-contrast-spacer +); diff --git a/packages/bootstrap/scss/colorpalette/_index.scss b/packages/bootstrap/scss/colorpalette/_index.scss index 4ca86780760..273931d8619 100644 --- a/packages/bootstrap/scss/colorpalette/_index.scss +++ b/packages/bootstrap/scss/colorpalette/_index.scss @@ -9,8 +9,9 @@ // Expose -@mixin color-palette-styles() { +@mixin kendo-color-palette--styles() { @include import-once( "color-palette" ) { + @include core-styles(); @include kendo-color-palette--layout(); @include kendo-color-palette--theme(); } diff --git a/packages/bootstrap/scss/colorpalette/_layout.scss b/packages/bootstrap/scss/colorpalette/_layout.scss index 752f815bda0..40c86c2d737 100644 --- a/packages/bootstrap/scss/colorpalette/_layout.scss +++ b/packages/bootstrap/scss/colorpalette/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/colorpalette/_layout.scss"; +@use "@progress/kendo-theme-default/scss/colorpalette/_layout.scss" as *; @mixin kendo-color-palette--layout() { diff --git a/packages/bootstrap/scss/colorpalette/_theme.scss b/packages/bootstrap/scss/colorpalette/_theme.scss index ee323729e10..0de2fcf618d 100644 --- a/packages/bootstrap/scss/colorpalette/_theme.scss +++ b/packages/bootstrap/scss/colorpalette/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/colorpalette/_theme.scss"; +@use "@progress/kendo-theme-default/scss/colorpalette/_theme.scss" as *; @mixin kendo-color-palette--theme() { diff --git a/packages/bootstrap/scss/colorpalette/_variables.scss b/packages/bootstrap/scss/colorpalette/_variables.scss index 88a9fd9499e..5bbe6de49e1 100644 --- a/packages/bootstrap/scss/colorpalette/_variables.scss +++ b/packages/bootstrap/scss/colorpalette/_variables.scss @@ -27,3 +27,15 @@ $kendo-color-palette-tile-hover-shadow: 0 0 3px 1px rgba( black, .3 ), inset 0 0 /// The shadow of the ColorPalette selected tile. /// @group color-palette $kendo-color-palette-tile-selected-shadow: 0 1px 3px 1px rgba( black, .3 ), inset 0 0 0 1px rgba( white, 1 ) !default; + + +@forward "@progress/kendo-theme-default/scss/colorpalette/_variables.scss" with ( + $kendo-color-palette-font-family: $kendo-color-palette-font-family, + $kendo-color-palette-font-size: $kendo-color-palette-font-size, + $kendo-color-palette-line-height: $kendo-color-palette-line-height, + $kendo-color-palette-tile-width: $kendo-color-palette-tile-width, + $kendo-color-palette-tile-height: $kendo-color-palette-tile-height, + $kendo-color-palette-tile-focus-shadow: $kendo-color-palette-tile-focus-shadow, + $kendo-color-palette-tile-hover-shadow: $kendo-color-palette-tile-hover-shadow, + $kendo-color-palette-tile-selected-shadow: $kendo-color-palette-tile-selected-shadow +); diff --git a/packages/bootstrap/scss/colorpicker/_index.scss b/packages/bootstrap/scss/colorpicker/_index.scss index 201170b4eae..b1e424b0b36 100644 --- a/packages/bootstrap/scss/colorpicker/_index.scss +++ b/packages/bootstrap/scss/colorpicker/_index.scss @@ -14,8 +14,14 @@ // Expose -@mixin colorpicker-styles() { - @include import-once( "colorpicker" ) { +@mixin kendo-color-picker--styles() { + @include import-once( "color-picker" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-button--styles(); + @include kendo-color-editor--styles(); + @include kendo-popup--styles(); + @include kendo-icon--styles(); @include kendo-color-picker--layout(); @include kendo-color-picker--theme(); } diff --git a/packages/bootstrap/scss/colorpicker/_layout.scss b/packages/bootstrap/scss/colorpicker/_layout.scss index 9dcef3ac45a..b1388d8e6cb 100644 --- a/packages/bootstrap/scss/colorpicker/_layout.scss +++ b/packages/bootstrap/scss/colorpicker/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/colorpicker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/colorpicker/_layout.scss" as *; @mixin kendo-color-picker--layout() { diff --git a/packages/bootstrap/scss/colorpicker/_theme.scss b/packages/bootstrap/scss/colorpicker/_theme.scss index af7819e7b7a..deb35549bea 100644 --- a/packages/bootstrap/scss/colorpicker/_theme.scss +++ b/packages/bootstrap/scss/colorpicker/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/colorpicker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/colorpicker/_theme.scss" as *; @mixin kendo-color-picker--theme() { diff --git a/packages/bootstrap/scss/combobox/_index.scss b/packages/bootstrap/scss/combobox/_index.scss index 03649ec8554..f52d8f2e0a5 100644 --- a/packages/bootstrap/scss/combobox/_index.scss +++ b/packages/bootstrap/scss/combobox/_index.scss @@ -5,17 +5,23 @@ // Dependencies -@use "../core/_index.scss"; -@use "../input/_index.scss"; -@use "../floating-label/_index.scss"; -@use "../icons/_index.scss"; -@use "../popup/_index.scss"; -@use "../list/_index.scss"; +@use "../core/_index.scss" as *; +@use "../input/_index.scss" as *; +@use "../floating-label/_index.scss" as *; +@use "../icons/_index.scss" as *; +@use "../popup/_index.scss" as *; +@use "../list/_index.scss" as *; // Expose -@mixin combobox-styles() { +@mixin kendo-combobox--styles() { @include import-once( "combobox" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); + @include kendo-icon--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); @include kendo-combobox--layout(); @include kendo-combobox--theme(); } diff --git a/packages/bootstrap/scss/combobox/_layout.scss b/packages/bootstrap/scss/combobox/_layout.scss index e8c8cc8a311..e72dda4c08f 100644 --- a/packages/bootstrap/scss/combobox/_layout.scss +++ b/packages/bootstrap/scss/combobox/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/combobox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/combobox/_layout.scss" as *; @mixin kendo-combobox--layout() { diff --git a/packages/bootstrap/scss/combobox/_theme.scss b/packages/bootstrap/scss/combobox/_theme.scss index 351d92c0dbc..1f1fb5d3524 100644 --- a/packages/bootstrap/scss/combobox/_theme.scss +++ b/packages/bootstrap/scss/combobox/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/combobox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/combobox/_theme.scss" as *; @mixin kendo-combobox--theme() { diff --git a/packages/bootstrap/scss/core/_index.scss b/packages/bootstrap/scss/core/_index.scss index 9d346662974..fe06293a061 100644 --- a/packages/bootstrap/scss/core/_index.scss +++ b/packages/bootstrap/scss/core/_index.scss @@ -59,48 +59,72 @@ // $kendo-color-primary: $kendo-color-primary !default, // $kendo-color-primary-lighter: $kendo-color-primary-lighter !default, $kendo-elevation: $kendo-elevation !default, + // Typography $kendo-font-size: $kendo-font-size !default, $kendo-font-sizes: $kendo-font-sizes !default, + $kendo-line-height: $kendo-line-height !default, $kendo-line-heights: $kendo-line-heights !default, + // $kendo-letter-spacings: $kendo-letter-spacings !default, $kendo-font-weights: $kendo-font-weights !default, + $kendo-font-family: $kendo-font-family !default, $kendo-font-families: $kendo-font-families !default, + // Border Radii $kendo-border-radii: $kendo-border-radii !default, + // Color System New $kendo-colors: $kendo-colors !default, + // Color System Switch $kendo-enable-color-system: $kendo-enable-color-system !default, - // Legacy + // Color System Old $kendo-theme-colors: $kendo-theme-colors !default, + $kendo-color-primary: $kendo-color-primary !default, + $kendo-color-primary-contrast: $kendo-color-primary-contrast !default, + $kendo-color-secondary: $kendo-color-secondary !default, + $kendo-color-tertiary: $kendo-color-tertiary !default, + $kendo-color-info: $kendo-color-info !default, + $kendo-color-success: $kendo-color-success !default, + $kendo-color-warning: $kendo-color-warning !default, + $kendo-color-error: $kendo-color-error !default, + $kendo-color-dark: $kendo-color-dark !default, + $kendo-color-light: $kendo-color-light !default, + $kendo-color-inverse: $kendo-color-inverse !default, $kendo-body-bg: $kendo-body-bg !default, $kendo-body-text: $kendo-body-text !default, + $kendo-subtle-text: $kendo-subtle-text !default, + $kendo-app-bg: $kendo-app-bg !default, + $kendo-app-text: $kendo-app-text !default, + $kendo-app-border: $kendo-app-border !default, + $kendo-link-text: $kendo-link-text !default, + $kendo-link-hover-text: $kendo-link-hover-text !default, $kendo-component-bg: $kendo-component-bg !default, $kendo-component-text: $kendo-component-text !default, $kendo-component-border: $kendo-component-border !default, $kendo-base-bg: $kendo-base-bg !default, $kendo-base-text: $kendo-base-text !default, $kendo-base-border: $kendo-base-border !default, + $kendo-base-gradient: $kendo-base-gradient !default, $kendo-hover-bg: $kendo-hover-bg !default, $kendo-hover-text: $kendo-hover-text !default, $kendo-hover-border: $kendo-hover-border !default, + $kendo-hover-gradient: $kendo-hover-gradient !default, $kendo-selected-bg: $kendo-selected-bg !default, $kendo-selected-text: $kendo-selected-text !default, $kendo-selected-border: $kendo-selected-border !default, + $kendo-selected-gradient: $kendo-selected-gradient !default, $kendo-selected-hover-bg: $kendo-selected-hover-bg !default, $kendo-selected-hover-text: $kendo-selected-hover-text !default, - $kendo-selected-hover-border: $kendo-selected-hover-border !default, - $kendo-subtle-text: $kendo-subtle-text !default, - $kendo-link-text: $kendo-link-text !default, - $kendo-link-hover-text: $kendo-link-hover-text !default, + /* $kendo-disabled-text: $kendo-disabled-text !default, + $kendo-disabled-bg: $kendo-disabled-bg !default, + $kendo-disabled-border: $kendo-disabled-border !default, + $kendo-disabled-opacity: $kendo-disabled-opacity !default, + $kendo-disabled-filter: $kendo-disabled-filter !default, */ + $kendo-component-header-bg: $kendo-component-header-bg !default, + $kendo-component-header-text: $kendo-component-header-text !default, + $kendo-component-header-border: $kendo-component-header-border !default, + $kendo-component-header-gradient: $kendo-component-header-gradient !default, $kendo-invalid-bg: $kendo-invalid-bg !default, $kendo-invalid-text: $kendo-invalid-text !default, $kendo-invalid-border: $kendo-invalid-border !default, - $kendo-invalid-shadow: $kendo-invalid-shadow !default, - // $kendo-disabled-text: $kendo-disabled-text !default, - // $kendo-disabled-bg: $kendo-disabled-bg !default, - // $kendo-disabled-border: $kendo-disabled-border !default, - // $kendo-disabled-opacity: $kendo-disabled-opacity !default, - // $kendo-disabled-filter: $kendo-disabled-filter !default, - // $kendo-disabled-styling: $kendo-disabled-styling !default, - // $kendo-nested-disabled: $kendo-nested-disabled !default, - $kendo-color-primary: $kendo-color-primary !default, + $kendo-invalid-shadow: $kendo-invalid-shadow !default ); diff --git a/packages/bootstrap/scss/dataviz/_index.scss b/packages/bootstrap/scss/dataviz/_index.scss index 66eebd84e47..05a43bc369d 100644 --- a/packages/bootstrap/scss/dataviz/_index.scss +++ b/packages/bootstrap/scss/dataviz/_index.scss @@ -13,6 +13,9 @@ // Expose @mixin kendo-dataviz--styles() { @include import-once( "dataviz" ) { + @include core-styles(); + @include kendo-popup--styles(); + @include kendo-tooltip--styles(); @include kendo-dataviz--layout(); @include kendo-dataviz--theme(); } diff --git a/packages/bootstrap/scss/dataviz/_layout.scss b/packages/bootstrap/scss/dataviz/_layout.scss index 9686120d120..2a9065c4659 100644 --- a/packages/bootstrap/scss/dataviz/_layout.scss +++ b/packages/bootstrap/scss/dataviz/_layout.scss @@ -1,8 +1,8 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../tooltip/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dataviz/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dataviz/_layout.scss" as *; @mixin kendo-dataviz--layout() { diff --git a/packages/bootstrap/scss/dataviz/_theme.scss b/packages/bootstrap/scss/dataviz/_theme.scss index c2e79cbb83e..f4e3ba1c446 100644 --- a/packages/bootstrap/scss/dataviz/_theme.scss +++ b/packages/bootstrap/scss/dataviz/_theme.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../button/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dataviz/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dataviz/_theme.scss" as *; @mixin kendo-dataviz--theme() { diff --git a/packages/bootstrap/scss/dataviz/_variables.scss b/packages/bootstrap/scss/dataviz/_variables.scss index 302ce6bf815..2a8b4610b1a 100644 --- a/packages/bootstrap/scss/dataviz/_variables.scss +++ b/packages/bootstrap/scss/dataviz/_variables.scss @@ -1,5 +1,5 @@ -// @use "sass:map"; -// @use "../core/_index.scss" as *; +@use "sass:map"; +@use "../core/_index.scss" as *; @use "../button/_variables.scss" as *; @@ -148,3 +148,108 @@ $kendo-chart-overlay-bg: $kendo-base-bg !default; $kendo-chart-no-data-font-size: var( --kendo-font-size-lg, inherit ) !default; $kendo-chart-no-data-font-weight: var( --kendo-font-weight, normal ) !default; $kendo-chart-no-data-padding-y: k-spacing( 25 ) !default; + + +@forward "@progress/kendo-theme-default/scss/dataviz/_variables.scss" with ( + $kendo-series-a: $kendo-series-a, + $kendo-series-a-dark: $kendo-series-a-dark, + $kendo-series-a-darker: $kendo-series-a-darker, + $kendo-series-a-light: $kendo-series-a-light, + $kendo-series-a-lighter: $kendo-series-a-lighter, + $kendo-series-b: $kendo-series-b, + $kendo-series-b-dark: $kendo-series-b-dark, + $kendo-series-b-darker: $kendo-series-b-darker, + $kendo-series-b-light: $kendo-series-b-light, + $kendo-series-b-lighter: $kendo-series-b-lighter, + $kendo-series-c: $kendo-series-c, + $kendo-series-c-dark: $kendo-series-c-dark, + $kendo-series-c-darker: $kendo-series-c-darker, + $kendo-series-c-light: $kendo-series-c-light, + $kendo-series-c-lighter: $kendo-series-c-lighter, + $kendo-series-d: $kendo-series-d, + $kendo-series-d-dark: $kendo-series-d-dark, + $kendo-series-d-darker: $kendo-series-d-darker, + $kendo-series-d-light: $kendo-series-d-light, + $kendo-series-d-lighter: $kendo-series-d-lighter, + $kendo-series-e: $kendo-series-e, + $kendo-series-e-dark: $kendo-series-e-dark, + $kendo-series-e-darker: $kendo-series-e-darker, + $kendo-series-e-light: $kendo-series-e-light, + $kendo-series-e-lighter: $kendo-series-e-lighter, + $kendo-series-f: $kendo-series-f, + $kendo-series-f-dark: $kendo-series-f-dark, + $kendo-series-f-darker: $kendo-series-f-darker, + $kendo-series-f-light: $kendo-series-f-light, + $kendo-series-f-lighter: $kendo-series-f-lighter, + $kendo-series-1: $kendo-series-1, + $kendo-series-2: $kendo-series-2, + $kendo-series-3: $kendo-series-3, + $kendo-series-4: $kendo-series-4, + $kendo-series-5: $kendo-series-5, + $kendo-series-6: $kendo-series-6, + $kendo-series-7: $kendo-series-7, + $kendo-series-8: $kendo-series-8, + $kendo-series-9: $kendo-series-9, + $kendo-series-10: $kendo-series-10, + $kendo-series-11: $kendo-series-11, + $kendo-series-12: $kendo-series-12, + $kendo-series-13: $kendo-series-13, + $kendo-series-14: $kendo-series-14, + $kendo-series-15: $kendo-series-15, + $kendo-series-16: $kendo-series-16, + $kendo-series-17: $kendo-series-17, + $kendo-series-18: $kendo-series-18, + $kendo-series-19: $kendo-series-19, + $kendo-series-20: $kendo-series-20, + $kendo-series-21: $kendo-series-21, + $kendo-series-22: $kendo-series-22, + $kendo-series-23: $kendo-series-23, + $kendo-series-24: $kendo-series-24, + $kendo-series-25: $kendo-series-25, + $kendo-series-26: $kendo-series-26, + $kendo-series-27: $kendo-series-27, + $kendo-series-28: $kendo-series-28, + $kendo-series-29: $kendo-series-29, + $kendo-series-30: $kendo-series-30, + $kendo-chart-border-width: $kendo-chart-border-width, + $kendo-chart-font-family: $kendo-chart-font-family, + $kendo-chart-font-size: $kendo-chart-font-size, + $kendo-chart-line-height: $kendo-chart-line-height, + $kendo-chart-sm-font-size: $kendo-chart-sm-font-size, + $kendo-chart-md-font-size: $kendo-chart-md-font-size, + $kendo-chart-lg-font-size: $kendo-chart-lg-font-size, + $kendo-chart-tooltip-font-size: $kendo-chart-tooltip-font-size, + $kendo-chart-label-font-size: $kendo-chart-label-font-size, + $kendo-chart-title-font-size: $kendo-chart-title-font-size, + $kendo-chart-pane-title-font-size: $kendo-chart-pane-title-font-size, + $kendo-chart-pane-title-font-weight: $kendo-chart-pane-title-font-weight, + $kendo-chart-major-lines: $kendo-chart-major-lines, + $kendo-chart-minor-lines: $kendo-chart-minor-lines, + $kendo-chart-inactive: $kendo-chart-inactive, + $kendo-chart-area-opacity: $kendo-chart-area-opacity, + $kendo-chart-area-inactive-opacity: $kendo-chart-area-inactive-opacity, + $kendo-chart-line-inactive-opacity: $kendo-chart-line-inactive-opacity, + $kendo-chart-tooltip-transition: $kendo-chart-tooltip-transition, + $kendo-chart-bg: $kendo-chart-bg, + $kendo-chart-text: $kendo-chart-text, + $kendo-chart-border: $kendo-chart-border, + $kendo-chart-crosshair-background: $kendo-chart-crosshair-background, + $kendo-chart-crosshair-shared-tooltip-color: $kendo-chart-crosshair-shared-tooltip-color, + $kendo-chart-crosshair-shared-tooltip-background: $kendo-chart-crosshair-shared-tooltip-background, + $kendo-chart-crosshair-shared-tooltip-border: $kendo-chart-crosshair-shared-tooltip-border, + $kendo-chart-notes-background: $kendo-chart-notes-background, + $kendo-chart-notes-border: $kendo-chart-notes-border, + $kendo-chart-notes-lines: $kendo-chart-notes-lines, + $kendo-chart-error-bars-background: $kendo-chart-error-bars-background, + $kendo-chart-selection-handle-size: $kendo-chart-selection-handle-size, + $kendo-chart-selection-border-color: $kendo-chart-selection-border-color, + $kendo-chart-selection-shadow: $kendo-chart-selection-shadow, + $kendo-chart-computed-title-height: $kendo-chart-computed-title-height, + $kendo-treemap-font-family: $kendo-treemap-font-family, + $kendo-treemap-font-size: $kendo-treemap-font-size, + $kendo-treemap-line-height: $kendo-treemap-line-height, + $kendo-chart-overlay-bg: $kendo-chart-overlay-bg, + $kendo-chart-no-data-font-size: $kendo-chart-no-data-font-size, + $kendo-chart-no-data-font-weight: $kendo-chart-no-data-font-weight, + $kendo-chart-no-data-padding-y: $kendo-chart-no-data-padding-y +); diff --git a/packages/bootstrap/scss/dateinput/_index.scss b/packages/bootstrap/scss/dateinput/_index.scss index e0928082998..08b6d5f06e3 100644 --- a/packages/bootstrap/scss/dateinput/_index.scss +++ b/packages/bootstrap/scss/dateinput/_index.scss @@ -10,8 +10,10 @@ // Expose -@mixin dateinput--styles() { - @include import-once( "dateinput" ) { +@mixin kendo-date-input--styles() { + @include import-once( "date-input" ) { + @include core-styles(); + @include kendo-input--styles(); @include kendo-date-input--layout(); @include kendo-date-input--theme(); } diff --git a/packages/bootstrap/scss/dateinput/_layout.scss b/packages/bootstrap/scss/dateinput/_layout.scss index 3d281bea6f6..72f3e09cd69 100644 --- a/packages/bootstrap/scss/dateinput/_layout.scss +++ b/packages/bootstrap/scss/dateinput/_layout.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/dateinput/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dateinput/_layout.scss" as *; -@mixin kendo-dateinput--layout() { +@mixin kendo-date-input--layout() { @include kendo-date-input--layout-base(); } diff --git a/packages/bootstrap/scss/dateinput/_theme.scss b/packages/bootstrap/scss/dateinput/_theme.scss index c63ac23c65f..59db93e37cd 100644 --- a/packages/bootstrap/scss/dateinput/_theme.scss +++ b/packages/bootstrap/scss/dateinput/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/dateinput/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dateinput/_theme.scss" as *; -@mixin kendo-dateinput--theme() { +@mixin kendo-date-input--theme() { @include kendo-date-input--theme-base(); } diff --git a/packages/bootstrap/scss/datepicker/_index.scss b/packages/bootstrap/scss/datepicker/_index.scss index 18b563ab3fd..7ed2b533046 100644 --- a/packages/bootstrap/scss/datepicker/_index.scss +++ b/packages/bootstrap/scss/datepicker/_index.scss @@ -12,8 +12,12 @@ // Expose -@mixin datepicker-styles() { - @include import-once( "datepicker" ) { +@mixin kendo-date-picker--styles() { + @include import-once( "date-picker" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-popup--styles(); + @include kendo-calendar--styles(); @include kendo-date-picker--layout(); @include kendo-date-picker--theme(); } diff --git a/packages/bootstrap/scss/datepicker/_layout.scss b/packages/bootstrap/scss/datepicker/_layout.scss index 914056892c7..5722176e50e 100644 --- a/packages/bootstrap/scss/datepicker/_layout.scss +++ b/packages/bootstrap/scss/datepicker/_layout.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/datepicker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/datepicker/_layout.scss" as *; -@mixin kendo-datepicker--layout() { +@mixin kendo-date-picker--layout() { @include kendo-date-picker--layout-base(); } diff --git a/packages/bootstrap/scss/datepicker/_theme.scss b/packages/bootstrap/scss/datepicker/_theme.scss index fb9367350b1..58186e13910 100644 --- a/packages/bootstrap/scss/datepicker/_theme.scss +++ b/packages/bootstrap/scss/datepicker/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/datepicker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/datepicker/_theme.scss" as *; -@mixin kendo-datepicker--theme() { +@mixin kendo-date-picker--theme() { @include kendo-date-picker--theme-base(); } diff --git a/packages/bootstrap/scss/daterangepicker/_index.scss b/packages/bootstrap/scss/daterangepicker/_index.scss index ec5d6ce549f..d5117739a74 100644 --- a/packages/bootstrap/scss/daterangepicker/_index.scss +++ b/packages/bootstrap/scss/daterangepicker/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; +// Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @use "../floating-label/_index.scss" as *; @@ -12,9 +13,14 @@ // Expose -@mixin daterangepicker-styles() { - @include import-once( "daterangepicker" ) { - @include kendo-daterangepicker--layout(); - @include kendo-daterangepicker--theme(); +@mixin kendo-date-range-picker--styles() { + @include import-once( "date-range-picker" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); + @include kendo-popup--styles(); + @include kendo-icon--styles(); + @include kendo-date-range-picker--layout(); + @include kendo-date-range-picker--theme(); } } diff --git a/packages/bootstrap/scss/daterangepicker/_layout.scss b/packages/bootstrap/scss/daterangepicker/_layout.scss index 59f2d55a1a3..efebd015bef 100644 --- a/packages/bootstrap/scss/daterangepicker/_layout.scss +++ b/packages/bootstrap/scss/daterangepicker/_layout.scss @@ -1,9 +1,9 @@ @use "../input/_variables.scss" as *; @use "./_variables.scss" as *; @use "../core/_index.scss" as *; -@import "@progress/kendo-theme-default/scss/daterangepicker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/daterangepicker/_layout.scss" as *; -@mixin kendo-daterangepicker--layout() { +@mixin kendo-date-range-picker--layout() { @include kendo-date-range-picker--layout-base(); } diff --git a/packages/bootstrap/scss/daterangepicker/_theme.scss b/packages/bootstrap/scss/daterangepicker/_theme.scss index 05128966979..d6d8acfb559 100644 --- a/packages/bootstrap/scss/daterangepicker/_theme.scss +++ b/packages/bootstrap/scss/daterangepicker/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/daterangepicker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/daterangepicker/_theme.scss" as *; -@mixin kendo-daterangepicker--theme() { +@mixin kendo-date-range-picker--theme() { @include kendo-date-range-picker--theme-base(); } diff --git a/packages/bootstrap/scss/daterangepicker/_variables.scss b/packages/bootstrap/scss/daterangepicker/_variables.scss index 928893a464e..8f72bf4af36 100644 --- a/packages/bootstrap/scss/daterangepicker/_variables.scss +++ b/packages/bootstrap/scss/daterangepicker/_variables.scss @@ -1,2 +1,7 @@ // Daterangepicker $kendo-daterange-picker-input-width: 10em !default; + + +@forward "@progress/kendo-theme-default/scss/daterangepicker/_variables.scss" with ( + $kendo-daterange-picker-input-width: $kendo-daterange-picker-input-width +); diff --git a/packages/bootstrap/scss/datetimepicker/_index.scss b/packages/bootstrap/scss/datetimepicker/_index.scss index 806668a8735..1b037673719 100644 --- a/packages/bootstrap/scss/datetimepicker/_index.scss +++ b/packages/bootstrap/scss/datetimepicker/_index.scss @@ -16,9 +16,17 @@ // Expose -@mixin datetimepicker-styles() { - @include import-once( "datetimepicker" ) { - @include kendo-datetimepicker--layout(); - @include kendo-datetimepicker--theme(); +@mixin kendo-date-time-picker--styles() { + @include import-once( "date-time-picker" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-button--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-calendar--styles(); + @include kendo-time-selector--styles(); + @include kendo-action-buttons--styles(); + @include kendo-date-time-picker--layout(); + @include kendo-date-time-picker--theme(); } } diff --git a/packages/bootstrap/scss/datetimepicker/_layout.scss b/packages/bootstrap/scss/datetimepicker/_layout.scss index 4ba73c6af61..5a1cefc3946 100644 --- a/packages/bootstrap/scss/datetimepicker/_layout.scss +++ b/packages/bootstrap/scss/datetimepicker/_layout.scss @@ -1,8 +1,8 @@ @use "./_variables.scss" as *; @use "../action-buttons/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/datetimepicker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/datetimepicker/_layout.scss" as *; -@mixin kendo-datetimepicker--layout() { +@mixin kendo-date-time-picker--layout() { @include kendo-date-time-picker--layout-base(); } diff --git a/packages/bootstrap/scss/datetimepicker/_theme.scss b/packages/bootstrap/scss/datetimepicker/_theme.scss index d7d6438d7c1..a530468de8c 100644 --- a/packages/bootstrap/scss/datetimepicker/_theme.scss +++ b/packages/bootstrap/scss/datetimepicker/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/datetimepicker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/datetimepicker/_theme.scss" as *; -@mixin kendo-datetimepicker--theme() { +@mixin kendo-date-time-picker--theme() { @include kendo-date-time-picker--theme-base(); } diff --git a/packages/bootstrap/scss/datetimepicker/_variables.scss b/packages/bootstrap/scss/datetimepicker/_variables.scss index 81d0569d3e2..82678a087ff 100644 --- a/packages/bootstrap/scss/datetimepicker/_variables.scss +++ b/packages/bootstrap/scss/datetimepicker/_variables.scss @@ -4,3 +4,8 @@ // DateTime $kendo-datetime-width: calc( calc( #{$kendo-calendar-cell-size} * 8 ) + calc( #{$kendo-infinite-calendar-view-padding-x} * 2 )) !default; + + +@forward "@progress/kendo-theme-default/scss/datetimepicker/_variables.scss" with ( + $kendo-datetime-width: $kendo-datetime-width +); diff --git a/packages/bootstrap/scss/dialog/_index.scss b/packages/bootstrap/scss/dialog/_index.scss index 31cdf4fb7c3..f72dcc2fe42 100644 --- a/packages/bootstrap/scss/dialog/_index.scss +++ b/packages/bootstrap/scss/dialog/_index.scss @@ -10,8 +10,10 @@ // Expose -@mixin dialog-styles() { +@mixin kendo-dialog--styles() { @include import-once( "dialog" ) { + @include core-styles(); + @include kendo-window--styles(); @include kendo-dialog--layout(); @include kendo-dialog--theme(); } diff --git a/packages/bootstrap/scss/dialog/_layout.scss b/packages/bootstrap/scss/dialog/_layout.scss index 7dc1ac3dc3e..8db8428ad67 100644 --- a/packages/bootstrap/scss/dialog/_layout.scss +++ b/packages/bootstrap/scss/dialog/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../window/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dialog/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dialog/_layout.scss" as *; @mixin kendo-dialog--layout() { diff --git a/packages/bootstrap/scss/dialog/_theme.scss b/packages/bootstrap/scss/dialog/_theme.scss index 78632355380..5fce1d43f02 100644 --- a/packages/bootstrap/scss/dialog/_theme.scss +++ b/packages/bootstrap/scss/dialog/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dialog/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dialog/_theme.scss" as *; @mixin kendo-dialog--theme() { diff --git a/packages/bootstrap/scss/dialog/_variables.scss b/packages/bootstrap/scss/dialog/_variables.scss index 90667af9f68..e513b556138 100644 --- a/packages/bootstrap/scss/dialog/_variables.scss +++ b/packages/bootstrap/scss/dialog/_variables.scss @@ -30,7 +30,19 @@ $kendo-dialog-button-spacing: $kendo-actions-button-spacing !default; /// The theme colors map for the Dialog. /// @group dialog $kendo-dialog-theme-colors: ( - "primary": k-map-get($kendo-theme-colors, "primary"), - "light": k-map-get($kendo-theme-colors, "light"), - "dark": k-map-get($kendo-theme-colors, "dark") + "primary": map.get($kendo-theme-colors, "primary"), + "light": map.get($kendo-theme-colors, "light"), + "dark": map.get($kendo-theme-colors, "dark") ) !default; + + +@forward "@progress/kendo-theme-default/scss/dialog/_variables.scss" with ( + $kendo-dialog-titlebar-bg: $kendo-dialog-titlebar-bg, + $kendo-dialog-titlebar-text: $kendo-dialog-titlebar-text, + $kendo-dialog-titlebar-border: $kendo-dialog-titlebar-border, + $kendo-dialog-buttongroup-padding-x: $kendo-dialog-buttongroup-padding-x, + $kendo-dialog-buttongroup-padding-y: $kendo-dialog-buttongroup-padding-y, + $kendo-dialog-buttongroup-border-width: $kendo-dialog-buttongroup-border-width, + $kendo-dialog-button-spacing: $kendo-dialog-button-spacing, + $kendo-dialog-theme-colors: $kendo-dialog-theme-colors +); diff --git a/packages/bootstrap/scss/dock-manager/_index.scss b/packages/bootstrap/scss/dock-manager/_index.scss index 09f2658ac00..e085509e38f 100644 --- a/packages/bootstrap/scss/dock-manager/_index.scss +++ b/packages/bootstrap/scss/dock-manager/_index.scss @@ -3,18 +3,22 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../splitter/_index.scss" as *; @use "../toolbar/_index.scss" as *; @use "../tabstrip/_index.scss" as *; + // Expose -@mixin dock-manager-styles() { - @include import-once( "dock-manager" ) { +@mixin kendo-dock-manager--styles() { + @include import-once("dock-manager") { + @include core-styles(); + @include kendo-splitter--styles(); + @include kendo-toolbar--styles(); + @include kendo-tabstrip--styles(); @include kendo-dock-manager--layout(); @include kendo-dock-manager--theme(); - // @include kendo-dock-navigator--layout(); - // @include kendo-dock-navigator--theme(); } } diff --git a/packages/bootstrap/scss/dock-manager/_layout.scss b/packages/bootstrap/scss/dock-manager/_layout.scss index 59c08f1fc5f..85032e9aa56 100644 --- a/packages/bootstrap/scss/dock-manager/_layout.scss +++ b/packages/bootstrap/scss/dock-manager/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dock-manager/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dock-manager/_layout.scss" as *; @mixin kendo-dock-manager--layout() { @include kendo-dock-manager--layout-base(); diff --git a/packages/bootstrap/scss/dock-manager/_theme.scss b/packages/bootstrap/scss/dock-manager/_theme.scss index ce7fea2114d..4bf3216bc1d 100644 --- a/packages/bootstrap/scss/dock-manager/_theme.scss +++ b/packages/bootstrap/scss/dock-manager/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dock-manager/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dock-manager/_theme.scss" as *; @mixin kendo-dock-manager--theme() { @include kendo-dock-manager--theme-base(); diff --git a/packages/bootstrap/scss/dock-manager/_variables.scss b/packages/bootstrap/scss/dock-manager/_variables.scss index 57d9e8fac29..08be50782a9 100644 --- a/packages/bootstrap/scss/dock-manager/_variables.scss +++ b/packages/bootstrap/scss/dock-manager/_variables.scss @@ -116,3 +116,42 @@ $kendo-dock-manager-dock-preview-bg: if($kendo-enable-color-system, color-mix(in /// The border color of the dropping area in the DockManager component. /// @group dock-manager $kendo-dock-manager-dock-preview-border: $kendo-color-primary !default; + + +@forward "@progress/kendo-theme-default/scss/dock-manager/_variables.scss" with ( + $kendo-dock-manager-border-width: $kendo-dock-manager-border-width, + $kendo-dock-manager-border-style: $kendo-dock-manager-border-style, + $kendo-dock-manager-border: $kendo-dock-manager-border, + $kendo-dock-manager-pane-header-padding-y: $kendo-dock-manager-pane-header-padding-y, + $kendo-dock-manager-pane-header-padding-x: $kendo-dock-manager-pane-header-padding-x, + $kendo-dock-manager-pane-header-border-width: $kendo-dock-manager-pane-header-border-width, + $kendo-dock-manager-pane-header-border-style: $kendo-dock-manager-pane-header-border-style, + $kendo-dock-manager-pane-header-bg: $kendo-dock-manager-pane-header-bg, + $kendo-dock-manager-pane-title-padding-y: $kendo-dock-manager-pane-title-padding-y, + $kendo-dock-manager-pane-title-padding-x: $kendo-dock-manager-pane-title-padding-x, + $kendo-dock-manager-pane-title-font-family: $kendo-dock-manager-pane-title-font-family, + $kendo-dock-manager-pane-title-font-size: $kendo-dock-manager-pane-title-font-size, + $kendo-dock-manager-pane-title-line-height: $kendo-dock-manager-pane-title-line-height, + $kendo-dock-manager-pane-title-font-weight: $kendo-dock-manager-pane-title-font-weight, + $kendo-dock-manager-pane-content-padding-x: $kendo-dock-manager-pane-content-padding-x, + $kendo-dock-manager-pane-content-padding-y: $kendo-dock-manager-pane-content-padding-y, + $kendo-dock-manager-tabbed-pane-padding-y: $kendo-dock-manager-tabbed-pane-padding-y, + $kendo-dock-manager-tabbed-pane-padding-x: $kendo-dock-manager-tabbed-pane-padding-x, + $kendo-dock-manager-unpinned-container-width: $kendo-dock-manager-unpinned-container-width, + $kendo-dock-manager-unpinned-container-bg: $kendo-dock-manager-unpinned-container-bg, + $kendo-dock-manager-unpinned-container-shadow: $kendo-dock-manager-unpinned-container-shadow, + $kendo-dock-indicator-padding: $kendo-dock-indicator-padding, + $kendo-dock-indicator-bg: $kendo-dock-indicator-bg, + $kendo-dock-indicator-text: $kendo-dock-indicator-text, + $kendo-dock-indicator-outline-width: $kendo-dock-indicator-outline-width, + $kendo-dock-indicator-outline-style: $kendo-dock-indicator-outline-style, + $kendo-dock-indicator-outline: $kendo-dock-indicator-outline, + $kendo-dock-indicator-shadow: $kendo-dock-indicator-shadow, + $kendo-dock-indicator-hover-bg: $kendo-dock-indicator-hover-bg, + $kendo-dock-indicator-hover-text: $kendo-dock-indicator-hover-text, + $kendo-dock-manager-dock-preview-border-width: $kendo-dock-manager-dock-preview-border-width, + $kendo-dock-manager-dock-preview-border-style: $kendo-dock-manager-dock-preview-border-style, + $kendo-dock-manager-dock-preview-border-radius: $kendo-dock-manager-dock-preview-border-radius, + $kendo-dock-manager-dock-preview-bg: $kendo-dock-manager-dock-preview-bg, + $kendo-dock-manager-dock-preview-border: $kendo-dock-manager-dock-preview-border +); diff --git a/packages/bootstrap/scss/draggable/_index.scss b/packages/bootstrap/scss/draggable/_index.scss index eb4c1036fc3..da4bb4d0175 100644 --- a/packages/bootstrap/scss/draggable/_index.scss +++ b/packages/bootstrap/scss/draggable/_index.scss @@ -9,8 +9,9 @@ // Expose -@mixin draggable-styles() { +@mixin kendo-draggable--styles() { @include import-once( "draggable" ) { + @include core-styles(); @include kendo-draggable--layout(); @include kendo-draggable--theme(); } diff --git a/packages/bootstrap/scss/draggable/_layout.scss b/packages/bootstrap/scss/draggable/_layout.scss index 1057660f1ba..52c35c90276 100644 --- a/packages/bootstrap/scss/draggable/_layout.scss +++ b/packages/bootstrap/scss/draggable/_layout.scss @@ -1,6 +1,6 @@ @use "./variables.scss" as *; @use "../core/_index.scss" as *; -@import "@progress/kendo-theme-default/scss/draggable/_layout.scss"; +@use "@progress/kendo-theme-default/scss/draggable/_layout.scss" as *; @mixin kendo-draggable--layout() { diff --git a/packages/bootstrap/scss/draggable/_theme.scss b/packages/bootstrap/scss/draggable/_theme.scss index 6ad2326b806..24f50d33c30 100644 --- a/packages/bootstrap/scss/draggable/_theme.scss +++ b/packages/bootstrap/scss/draggable/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./variables.scss" as *; -@import "@progress/kendo-theme-default/scss/draggable/_theme.scss"; +@use "@progress/kendo-theme-default/scss/draggable/_theme.scss" as *; @mixin kendo-draggable--theme() { diff --git a/packages/bootstrap/scss/draggable/_variables.scss b/packages/bootstrap/scss/draggable/_variables.scss index da4d212715d..c1e614c8879 100644 --- a/packages/bootstrap/scss/draggable/_variables.scss +++ b/packages/bootstrap/scss/draggable/_variables.scss @@ -1,6 +1,7 @@ @use "sass:math"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; +// @use "../core/spacing/_index.scss" as *; // Drag hint $kendo-drag-hint-padding-x: $btn-padding-x !default; @@ -29,3 +30,27 @@ $kendo-drop-hint-line-v-width: $kendo-drop-hint-line-h-height !default; $kendo-drop-hint-line-v-height: $kendo-drop-hint-line-h-width !default; $kendo-drop-hint-bg: $kendo-color-primary !default; + + +@forward "@progress/kendo-theme-default/scss/draggable/_variables.scss" with ( + $kendo-drag-hint-padding-x: $kendo-drag-hint-padding-x, + $kendo-drag-hint-padding-y: $kendo-drag-hint-padding-y, + $kendo-drag-hint-border-width: $kendo-drag-hint-border-width, + $kendo-drag-hint-border-radius: $kendo-drag-hint-border-radius, + $kendo-drag-hint-font-size: $kendo-drag-hint-font-size, + $kendo-drag-hint-font-family: $kendo-drag-hint-font-family, + $kendo-drag-hint-line-height: $kendo-drag-hint-line-height, + $kendo-drag-hint-bg: $kendo-drag-hint-bg, + $kendo-drag-hint-text: $kendo-drag-hint-text, + $kendo-drag-hint-border: $kendo-drag-hint-border, + $kendo-drag-hint-gradient: $kendo-drag-hint-gradient, + $kendo-drag-hint-shadow: $kendo-drag-hint-shadow, + $kendo-drag-hint-opacity: $kendo-drag-hint-opacity, + $kendo-drop-hint-arrow-size: $kendo-drop-hint-arrow-size, + $kendo-drop-hint-arrow-spacing: $kendo-drop-hint-arrow-spacing, + $kendo-drop-hint-line-h-width: $kendo-drop-hint-line-h-width, + $kendo-drop-hint-line-h-height: $kendo-drop-hint-line-h-height, + $kendo-drop-hint-line-v-width: $kendo-drop-hint-line-v-width, + $kendo-drop-hint-line-v-height: $kendo-drop-hint-line-v-height, + $kendo-drop-hint-bg: $kendo-drop-hint-bg +); diff --git a/packages/bootstrap/scss/drawer/_index.scss b/packages/bootstrap/scss/drawer/_index.scss index 72947c37b90..0ae92e5091b 100644 --- a/packages/bootstrap/scss/drawer/_index.scss +++ b/packages/bootstrap/scss/drawer/_index.scss @@ -12,8 +12,12 @@ // Expose -@mixin drawer-styles() { +@mixin kendo-drawer--styles() { @include import-once( "drawer" ) { + @include core-styles(); + @include kendo-overlay--styles(); + @include kendo-toolbar--styles(); + @include kendo-list--styles(); @include kendo-drawer--layout(); @include kendo-drawer--theme(); } diff --git a/packages/bootstrap/scss/drawer/_layout.scss b/packages/bootstrap/scss/drawer/_layout.scss index 6beae629cb9..cc24d1220f8 100644 --- a/packages/bootstrap/scss/drawer/_layout.scss +++ b/packages/bootstrap/scss/drawer/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/drawer/_layout.scss"; +@use "@progress/kendo-theme-default/scss/drawer/_layout.scss" as *; @mixin kendo-drawer--layout() { diff --git a/packages/bootstrap/scss/drawer/_theme.scss b/packages/bootstrap/scss/drawer/_theme.scss index 54fa8924f4c..8a59bf01e05 100644 --- a/packages/bootstrap/scss/drawer/_theme.scss +++ b/packages/bootstrap/scss/drawer/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/drawer/_theme.scss"; +@use "@progress/kendo-theme-default/scss/drawer/_theme.scss" as *; @mixin kendo-drawer--theme() { diff --git a/packages/bootstrap/scss/drawer/_variables.scss b/packages/bootstrap/scss/drawer/_variables.scss index 1173daf6e09..165fa6cc043 100644 --- a/packages/bootstrap/scss/drawer/_variables.scss +++ b/packages/bootstrap/scss/drawer/_variables.scss @@ -1,7 +1,8 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "../list/_variables.scss" as *; +@use "../icons/_variables.scss" as *; // Drawer @@ -53,10 +54,10 @@ $kendo-drawer-scrollbar-hover-color: rgba( 156, 156, 156, 1 ) !default; /// The horizontal padding of the Drawer item. /// @group drawer -$kendo-drawer-item-padding-x: $kendo-padding-md-x !default; +$kendo-drawer-item-padding-x: k-spacing(4) !default; /// The vertical padding of the Drawer item. /// @group drawer -$kendo-drawer-item-padding-y: $kendo-padding-md-y !default; +$kendo-drawer-item-padding-y: k-spacing(1) !default; /// The font size of the Drawer item. /// @group drawer $kendo-drawer-item-font-size: var( --kendo-font-size, inherit ) !default; @@ -109,3 +110,38 @@ $kendo-drawer-selected-hover-bg: if($kendo-enable-color-system, k-color( primary /// The text color of the selected and hovered Drawer item. /// @group drawer $kendo-drawer-selected-hover-text: $kendo-selected-text !default; + + +@forward "@progress/kendo-theme-default/scss/drawer/_variables.scss" with ( + $kendo-drawer-bg: $kendo-drawer-bg, + $kendo-drawer-text: $kendo-drawer-text, + $kendo-drawer-border: $kendo-drawer-border, + $kendo-drawer-border-width: $kendo-drawer-border-width, + $kendo-drawer-font-family: $kendo-drawer-font-family, + $kendo-drawer-font-size: $kendo-drawer-font-size, + $kendo-drawer-line-height: $kendo-drawer-line-height, + $kendo-drawer-content-padding-x: $kendo-drawer-content-padding-x, + $kendo-drawer-content-padding-y: $kendo-drawer-content-padding-y, + $kendo-drawer-scrollbar-width: $kendo-drawer-scrollbar-width, + $kendo-drawer-scrollbar-color: $kendo-drawer-scrollbar-color, + $kendo-drawer-scrollbar-bg: $kendo-drawer-scrollbar-bg, + $kendo-drawer-scrollbar-radius: $kendo-drawer-scrollbar-radius, + $kendo-drawer-scrollbar-hover-color: $kendo-drawer-scrollbar-hover-color, + $kendo-drawer-item-padding-x: $kendo-drawer-item-padding-x, + $kendo-drawer-item-padding-y: $kendo-drawer-item-padding-y, + $kendo-drawer-item-font-size: $kendo-drawer-item-font-size, + $kendo-drawer-item-line-height: $kendo-drawer-item-line-height, + $kendo-drawer-item-level-padding-x: $kendo-drawer-item-level-padding-x, + $kendo-drawer-item-level-count: $kendo-drawer-item-level-count, + $kendo-drawer-icon-padding-x: $kendo-drawer-icon-padding-x, + $kendo-drawer-icon-padding-y: $kendo-drawer-icon-padding-y, + $kendo-drawer-mini-initial-width: $kendo-drawer-mini-initial-width, + $kendo-drawer-hover-bg: $kendo-drawer-hover-bg, + $kendo-drawer-hover-text: $kendo-drawer-hover-text, + $kendo-drawer-focus-bg: $kendo-drawer-focus-bg, + $kendo-drawer-focus-shadow: $kendo-drawer-focus-shadow, + $kendo-drawer-selected-bg: $kendo-drawer-selected-bg, + $kendo-drawer-selected-text: $kendo-drawer-selected-text, + $kendo-drawer-selected-hover-bg: $kendo-drawer-selected-hover-bg, + $kendo-drawer-selected-hover-text: $kendo-drawer-selected-hover-text +); diff --git a/packages/bootstrap/scss/dropdowngrid/_index.scss b/packages/bootstrap/scss/dropdowngrid/_index.scss index 976db639999..b07e7b6c13f 100644 --- a/packages/bootstrap/scss/dropdowngrid/_index.scss +++ b/packages/bootstrap/scss/dropdowngrid/_index.scss @@ -14,9 +14,15 @@ // Expose -@mixin dropdowngrid-styles() { - @include import-once( "dropdowngrid" ) { - @include kendo-dropdowngrid--layout(); - @include kendo-dropdowngrid--theme(); +@mixin kendo-dropdown-grid--styles() { + @include import-once( "dropdown-grid" ) { + @include core-styles(); + @include kendo-floating-label--styles(); + @include kendo-icon--styles(); + @include kendo-input--styles(); + @include kendo-popup--styles(); + @include kendo-table--styles(); + @include kendo-dropdown-grid--layout(); + @include kendo-dropdown-grid--theme(); } } diff --git a/packages/bootstrap/scss/dropdowngrid/_layout.scss b/packages/bootstrap/scss/dropdowngrid/_layout.scss index 9ce75b064ef..4e7dc7c6913 100644 --- a/packages/bootstrap/scss/dropdowngrid/_layout.scss +++ b/packages/bootstrap/scss/dropdowngrid/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/dropdowngrid/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dropdowngrid/_layout.scss" as *; @mixin kendo-dropdown-grid--layout() { diff --git a/packages/bootstrap/scss/dropdowngrid/_theme.scss b/packages/bootstrap/scss/dropdowngrid/_theme.scss index 3f30d91ead8..5a99770772f 100644 --- a/packages/bootstrap/scss/dropdowngrid/_theme.scss +++ b/packages/bootstrap/scss/dropdowngrid/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/dropdowngrid/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dropdowngrid/_theme.scss" as *; -@mixin kendo-dropdowngrid--theme() { +@mixin kendo-dropdown-grid--theme() { @include kendo-dropdown-grid--theme-base(); } diff --git a/packages/bootstrap/scss/dropdownlist/_index.scss b/packages/bootstrap/scss/dropdownlist/_index.scss index d50feb3d736..5cc7a4d46f9 100644 --- a/packages/bootstrap/scss/dropdownlist/_index.scss +++ b/packages/bootstrap/scss/dropdownlist/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @@ -10,10 +11,16 @@ @use "../popup/_index.scss" as *; @use "../list/_index.scss" as *; + // Expose -@mixin dropdownlist-styles() { - @include import-once( "dropdownlist" ) { - @include kendo-dropdownlist--layout(); - @include kendo-dropdownlist--theme(); +@mixin kendo-dropdown-list--styles() { + @include import-once( "dropdown-list" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-dropdown-list--layout(); + @include kendo-dropdown-list--theme(); } } diff --git a/packages/bootstrap/scss/dropdownlist/_layout.scss b/packages/bootstrap/scss/dropdownlist/_layout.scss index 4e11f60a508..b94f5f5fa03 100644 --- a/packages/bootstrap/scss/dropdownlist/_layout.scss +++ b/packages/bootstrap/scss/dropdownlist/_layout.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/dropdownlist/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dropdownlist/_layout.scss" as *; -@mixin kendo-dropdownlist--layout() { +@mixin kendo-dropdown-list--layout() { @include kendo-dropdown-list--layout-base(); } diff --git a/packages/bootstrap/scss/dropdownlist/_theme.scss b/packages/bootstrap/scss/dropdownlist/_theme.scss index f685dbd73dd..68893ef09fb 100644 --- a/packages/bootstrap/scss/dropdownlist/_theme.scss +++ b/packages/bootstrap/scss/dropdownlist/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/dropdownlist/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dropdownlist/_theme.scss" as *; -@mixin kendo-dropdownlist--theme() { +@mixin kendo-dropdown-list--theme() { @include kendo-dropdown-list--theme-base(); } diff --git a/packages/bootstrap/scss/dropdowntree/_index.scss b/packages/bootstrap/scss/dropdowntree/_index.scss index 65c8db6f393..25d6aa36955 100644 --- a/packages/bootstrap/scss/dropdowntree/_index.scss +++ b/packages/bootstrap/scss/dropdowntree/_index.scss @@ -12,11 +12,17 @@ @use "../multiselect/_index.scss" as *; @use "../treeview/_index.scss" as *; + // Expose -@mixin dropdowntree-styles() { - @include import-once( "dropdowntree" ) { - @include kendo-dropdowntree--layout(); - @include kendo-dropdowntree--theme(); +@mixin kendo-dropdown-tree--styles() { + @include import-once( "dropdown-tree" ) { + @include core-styles(); + @include kendo-floating-label--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-multiselect--styles(); + @include kendo-treeview--styles(); + @include kendo-dropdown-tree--layout(); + @include kendo-dropdown-tree--theme(); @include kendo-utils--typography--text-align(); } } diff --git a/packages/bootstrap/scss/dropdowntree/_layout.scss b/packages/bootstrap/scss/dropdowntree/_layout.scss index 415de6d13cc..542706bb016 100644 --- a/packages/bootstrap/scss/dropdowntree/_layout.scss +++ b/packages/bootstrap/scss/dropdowntree/_layout.scss @@ -1,7 +1,7 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dropdowntree/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dropdowntree/_layout.scss" as *; -@mixin kendo-dropdowntree--layout() { +@mixin kendo-dropdown-tree--layout() { @include kendo-dropdown-tree--layout-base(); } diff --git a/packages/bootstrap/scss/dropdowntree/_theme.scss b/packages/bootstrap/scss/dropdowntree/_theme.scss index 6b3eafcca54..ca205a1dd05 100644 --- a/packages/bootstrap/scss/dropdowntree/_theme.scss +++ b/packages/bootstrap/scss/dropdowntree/_theme.scss @@ -1,6 +1,6 @@ -@import "@progress/kendo-theme-default/scss/dropdowntree/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dropdowntree/_theme.scss" as *; -@mixin kendo-dropdowntree--theme() { +@mixin kendo-dropdown-tree--theme() { @include kendo-dropdown-tree--theme-base(); } diff --git a/packages/bootstrap/scss/dropdowntree/_variables.scss b/packages/bootstrap/scss/dropdowntree/_variables.scss index 745b75c9d85..d7427129168 100644 --- a/packages/bootstrap/scss/dropdowntree/_variables.scss +++ b/packages/bootstrap/scss/dropdowntree/_variables.scss @@ -7,3 +7,9 @@ $kendo-dropdowntree-popup-padding-x: k-spacing(2) !default; /// The vertical padding of the DropdownTree popup /// @group dropdowntree $kendo-dropdowntree-popup-padding-y: k-spacing(2) !default; + + +@forward "@progress/kendo-theme-default/scss/dropdowntree/_variables.scss" with ( + $kendo-dropdowntree-popup-padding-x: $kendo-dropdowntree-popup-padding-x, + $kendo-dropdowntree-popup-padding-y: $kendo-dropdowntree-popup-padding-y +); diff --git a/packages/bootstrap/scss/dropzone/_index.scss b/packages/bootstrap/scss/dropzone/_index.scss index cdd7f284272..e6cd60f8bc6 100644 --- a/packages/bootstrap/scss/dropzone/_index.scss +++ b/packages/bootstrap/scss/dropzone/_index.scss @@ -7,9 +7,11 @@ // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin dropzone-styles() { +@mixin kendo-dropzone--styles() { @include import-once( "dropzone" ) { + @include core-styles(); @include kendo-dropzone--layout(); @include kendo-dropzone--theme(); } diff --git a/packages/bootstrap/scss/dropzone/_layout.scss b/packages/bootstrap/scss/dropzone/_layout.scss index 86bddabb4c5..543b7f85df0 100644 --- a/packages/bootstrap/scss/dropzone/_layout.scss +++ b/packages/bootstrap/scss/dropzone/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dropzone/_layout.scss"; +@use "@progress/kendo-theme-default/scss/dropzone/_layout.scss" as *; @mixin kendo-dropzone--layout() { diff --git a/packages/bootstrap/scss/dropzone/_theme.scss b/packages/bootstrap/scss/dropzone/_theme.scss index 6cf6e05956a..b22779d40de 100644 --- a/packages/bootstrap/scss/dropzone/_theme.scss +++ b/packages/bootstrap/scss/dropzone/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/dropzone/_theme.scss"; +@use "@progress/kendo-theme-default/scss/dropzone/_theme.scss" as *; @mixin kendo-dropzone--theme() { diff --git a/packages/bootstrap/scss/dropzone/_variables.scss b/packages/bootstrap/scss/dropzone/_variables.scss index a4905d8e763..f4d82a08b1e 100644 --- a/packages/bootstrap/scss/dropzone/_variables.scss +++ b/packages/bootstrap/scss/dropzone/_variables.scss @@ -65,3 +65,26 @@ $kendo-dropzone-note-spacing: null !default; /// The text color of the DropZone note. /// @group dropzone $kendo-dropzone-note-text: $kendo-subtle-text !default; + + +@forward "@progress/kendo-theme-default/scss/dropzone/_variables.scss" with ( + $kendo-dropzone-padding-x: $kendo-dropzone-padding-x, + $kendo-dropzone-padding-y: $kendo-dropzone-padding-y, + $kendo-dropzone-border-width: $kendo-dropzone-border-width, + $kendo-dropzone-min-height: $kendo-dropzone-min-height, + $kendo-dropzone-font-family: $kendo-dropzone-font-family, + $kendo-dropzone-font-size: $kendo-dropzone-font-size, + $kendo-dropzone-line-height: $kendo-dropzone-line-height, + $kendo-dropzone-bg: $kendo-dropzone-bg, + $kendo-dropzone-text: $kendo-dropzone-text, + $kendo-dropzone-border: $kendo-dropzone-border, + $kendo-dropzone-icon-spacing: $kendo-dropzone-icon-spacing, + $kendo-dropzone-icon-text: $kendo-dropzone-icon-text, + $kendo-dropzone-icon-hover-text: $kendo-dropzone-icon-hover-text, + $kendo-dropzone-hint-font-size: $kendo-dropzone-hint-font-size, + $kendo-dropzone-hint-spacing: $kendo-dropzone-hint-spacing, + $kendo-dropzone-hint-text: $kendo-dropzone-hint-text, + $kendo-dropzone-note-font-size: $kendo-dropzone-note-font-size, + $kendo-dropzone-note-spacing: $kendo-dropzone-note-spacing, + $kendo-dropzone-note-text: $kendo-dropzone-note-text +); diff --git a/packages/bootstrap/scss/editor/_index.scss b/packages/bootstrap/scss/editor/_index.scss index ebfa5f705d6..165b6162ca1 100644 --- a/packages/bootstrap/scss/editor/_index.scss +++ b/packages/bootstrap/scss/editor/_index.scss @@ -15,9 +15,19 @@ @use "../upload/_index.scss" as *; @use "../window/_index.scss" as *; + // Expose -@mixin editor-styles() { +@mixin kendo-editor--styles() { @include import-once( "editor" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-checkbox--styles(); + @include kendo-color-picker--styles(); + @include kendo-combobox--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-toolbar--styles(); + @include kendo-upload--styles(); + @include kendo-window--styles(); @include kendo-editor--layout(); @include kendo-editor--theme(); } diff --git a/packages/bootstrap/scss/editor/_layout.scss b/packages/bootstrap/scss/editor/_layout.scss index 609bf61af04..8950947b22d 100644 --- a/packages/bootstrap/scss/editor/_layout.scss +++ b/packages/bootstrap/scss/editor/_layout.scss @@ -1,10 +1,10 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../toolbar/_variables.scss" as *; @use "../window/_variables.scss" as *; @use "../input/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/editor/_layout.scss"; +@use "@progress/kendo-theme-default/scss/editor/_layout.scss" as *; @mixin kendo-editor--layout() { diff --git a/packages/bootstrap/scss/editor/_theme.scss b/packages/bootstrap/scss/editor/_theme.scss index 90322e75018..afdd061c871 100644 --- a/packages/bootstrap/scss/editor/_theme.scss +++ b/packages/bootstrap/scss/editor/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/editor/_theme.scss"; +@use "@progress/kendo-theme-default/scss/editor/_theme.scss" as *; @mixin kendo-editor--theme() { diff --git a/packages/bootstrap/scss/editor/_variables.scss b/packages/bootstrap/scss/editor/_variables.scss index 78020e13078..6fe8110ee48 100644 --- a/packages/bootstrap/scss/editor/_variables.scss +++ b/packages/bootstrap/scss/editor/_variables.scss @@ -58,3 +58,23 @@ $kendo-editor-selectednode-outline-width: 2px !default; /// The outline color of the Editor's selected node. /// @group editor $kendo-editor-selectednode-outline-color: #88ccff !default; + + +@forward "@progress/kendo-theme-default/scss/editor/_variables.scss" with ( + $kendo-editor-border-width: $kendo-editor-border-width, + $kendo-editor-font-family: $kendo-editor-font-family, + $kendo-editor-font-size: $kendo-editor-font-size, + $kendo-editor-line-height: $kendo-editor-line-height, + $kendo-editor-placeholder-text: $kendo-editor-placeholder-text, + $kendo-editor-placeholder-opacity: $kendo-editor-placeholder-opacity, + $kendo-editor-selected-text: $kendo-editor-selected-text, + $kendo-editor-selected-bg: $kendo-editor-selected-bg, + $kendo-editor-highlighted-bg: $kendo-editor-highlighted-bg, + $kendo-editor-export-tool-icon-margin-x: $kendo-editor-export-tool-icon-margin-x, + $kendo-editor-resize-handle-size: $kendo-editor-resize-handle-size, + $kendo-editor-resize-handle-border-width: $kendo-editor-resize-handle-border-width, + $kendo-editor-resize-handle-border: $kendo-editor-resize-handle-border, + $kendo-editor-resize-handle-bg: $kendo-editor-resize-handle-bg, + $kendo-editor-selectednode-outline-width: $kendo-editor-selectednode-outline-width, + $kendo-editor-selectednode-outline-color: $kendo-editor-selectednode-outline-color +); diff --git a/packages/bootstrap/scss/expansion-panel/_index.scss b/packages/bootstrap/scss/expansion-panel/_index.scss index 0fb3d5c8668..f13b26dd225 100644 --- a/packages/bootstrap/scss/expansion-panel/_index.scss +++ b/packages/bootstrap/scss/expansion-panel/_index.scss @@ -12,10 +12,13 @@ // Expose -@mixin expansion-panel-styles() { - @include import-once( "expansion-panel" ) { - @include kendo-expansion-panel--layout(); - @include kendo-expansion-panel--theme(); +@mixin kendo-expander--styles() { + @include import-once( "expander" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-list--styles(); + @include kendo-expander--layout(); + @include kendo-expander--theme(); @include kendo-utils--layout--display(); } } diff --git a/packages/bootstrap/scss/expansion-panel/_layout.scss b/packages/bootstrap/scss/expansion-panel/_layout.scss index 2120b9c53a3..26c6850ca82 100644 --- a/packages/bootstrap/scss/expansion-panel/_layout.scss +++ b/packages/bootstrap/scss/expansion-panel/_layout.scss @@ -1,8 +1,8 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/expansion-panel/_layout.scss"; +@use "@progress/kendo-theme-default/scss/expansion-panel/_layout.scss" as *; -@mixin kendo-expansion-panel--layout() { +@mixin kendo-expander--layout() { @include kendo-expander--layout-base(); } diff --git a/packages/bootstrap/scss/expansion-panel/_theme.scss b/packages/bootstrap/scss/expansion-panel/_theme.scss index 088b0ce5262..1b4802b9392 100644 --- a/packages/bootstrap/scss/expansion-panel/_theme.scss +++ b/packages/bootstrap/scss/expansion-panel/_theme.scss @@ -1,8 +1,8 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/expansion-panel/_theme.scss"; +@use "@progress/kendo-theme-default/scss/expansion-panel/_theme.scss" as *; -@mixin kendo-expansion-panel--theme() { +@mixin kendo-expander--theme() { @include kendo-expander--theme-base(); } diff --git a/packages/bootstrap/scss/expansion-panel/_variables.scss b/packages/bootstrap/scss/expansion-panel/_variables.scss index ee18d789fa8..4a289130306 100644 --- a/packages/bootstrap/scss/expansion-panel/_variables.scss +++ b/packages/bootstrap/scss/expansion-panel/_variables.scss @@ -79,3 +79,29 @@ $kendo-expander-content-padding-x: k-spacing(6) !default; /// The vertical padding of the ExpansionPanel content. /// @group expander $kendo-expander-content-padding-y: k-spacing(6) !default; + + +@forward "@progress/kendo-theme-default/scss/expansion-panel/_variables.scss" with ( + $kendo-expander-spacing-y: $kendo-expander-spacing-y, + $kendo-expander-border-width: $kendo-expander-border-width, + $kendo-expander-font-family: $kendo-expander-font-family, + $kendo-expander-font-size: $kendo-expander-font-size, + $kendo-expander-line-height: $kendo-expander-line-height, + $kendo-expander-text: $kendo-expander-text, + $kendo-expander-bg: $kendo-expander-bg, + $kendo-expander-border: $kendo-expander-border, + $kendo-expander-focus-shadow: $kendo-expander-focus-shadow, + $kendo-expander-header-padding-x: $kendo-expander-header-padding-x, + $kendo-expander-header-padding-y: $kendo-expander-header-padding-y, + $kendo-expander-header-text: $kendo-expander-header-text, + $kendo-expander-header-bg: $kendo-expander-header-bg, + $kendo-expander-header-border: $kendo-expander-header-border, + $kendo-expander-header-hover-bg: $kendo-expander-header-hover-bg, + $kendo-expander-header-focus-bg: $kendo-expander-header-focus-bg, + $kendo-expander-header-focus-shadow: $kendo-expander-header-focus-shadow, + $kendo-expander-title-text: $kendo-expander-title-text, + $kendo-expander-header-sub-title-text: $kendo-expander-header-sub-title-text, + $kendo-expander-indicator-margin-x: $kendo-expander-indicator-margin-x, + $kendo-expander-content-padding-x: $kendo-expander-content-padding-x, + $kendo-expander-content-padding-y: $kendo-expander-content-padding-y +); diff --git a/packages/bootstrap/scss/fab/_index.scss b/packages/bootstrap/scss/fab/_index.scss index 3424450d303..9f80ef8067a 100644 --- a/packages/bootstrap/scss/fab/_index.scss +++ b/packages/bootstrap/scss/fab/_index.scss @@ -11,9 +11,14 @@ @use "../button/_index.scss" as *; @use "../badge/_index.scss" as *; + // Expose -@mixin fab-styles() { +@mixin kendo-fab--styles() { @include import-once( "fab" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-button--styles(); + @include kendo-badge--styles(); @include kendo-fab--layout(); @include kendo-fab--theme(); @include kendo-utils--layout--position(); diff --git a/packages/bootstrap/scss/fab/_layout.scss b/packages/bootstrap/scss/fab/_layout.scss index 70487fd0699..7acf4a2b783 100644 --- a/packages/bootstrap/scss/fab/_layout.scss +++ b/packages/bootstrap/scss/fab/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/fab/_layout.scss"; +@use "@progress/kendo-theme-default/scss/fab/_layout.scss" as *; @mixin kendo-fab--layout() { diff --git a/packages/bootstrap/scss/fab/_theme.scss b/packages/bootstrap/scss/fab/_theme.scss index 46d15c29a1a..70401e1a524 100644 --- a/packages/bootstrap/scss/fab/_theme.scss +++ b/packages/bootstrap/scss/fab/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/fab/_theme.scss"; +@use "@progress/kendo-theme-default/scss/fab/_theme.scss" as *; @mixin kendo-fab--theme() { diff --git a/packages/bootstrap/scss/fab/_variables.scss b/packages/bootstrap/scss/fab/_variables.scss index 7450d10a1fb..7a08c49c9bb 100644 --- a/packages/bootstrap/scss/fab/_variables.scss +++ b/packages/bootstrap/scss/fab/_variables.scss @@ -170,3 +170,54 @@ $kendo-fab-item-outline-width: 3px !default; /// The outline color of the FAB item. /// @group floating-action-button $kendo-fab-item-outline-color: $kendo-button-bg !default; + + +@forward "@progress/kendo-theme-default/scss/fab/_variables.scss" with ( + $kendo-fab-border-width: $kendo-fab-border-width, + $kendo-fab-border-radius: $kendo-fab-border-radius, + $kendo-fab-font-family: $kendo-fab-font-family, + $kendo-fab-font-size: $kendo-fab-font-size, + $kendo-fab-line-height: $kendo-fab-line-height, + $kendo-fab-padding-x: $kendo-fab-padding-x, + $kendo-fab-sm-padding-x: $kendo-fab-sm-padding-x, + $kendo-fab-md-padding-x: $kendo-fab-md-padding-x, + $kendo-fab-lg-padding-x: $kendo-fab-lg-padding-x, + $kendo-fab-padding-y: $kendo-fab-padding-y, + $kendo-fab-sm-padding-y: $kendo-fab-sm-padding-y, + $kendo-fab-md-padding-y: $kendo-fab-md-padding-y, + $kendo-fab-lg-padding-y: $kendo-fab-lg-padding-y, + $kendo-fab-icon-padding-x: $kendo-fab-icon-padding-x, + $kendo-fab-icon-padding-y: $kendo-fab-icon-padding-y, + $kendo-fab-icon-spacing: $kendo-fab-icon-spacing, + $kendo-fab-items-padding-x: $kendo-fab-items-padding-x, + $kendo-fab-items-padding-y: $kendo-fab-items-padding-y, + $kendo-fab-item-text-padding-x: $kendo-fab-item-text-padding-x, + $kendo-fab-item-text-padding-y: $kendo-fab-item-text-padding-y, + $kendo-fab-item-text-border-width: $kendo-fab-item-text-border-width, + $kendo-fab-item-text-border-radius: $kendo-fab-item-text-border-radius, + $kendo-fab-item-text-font-size: $kendo-fab-item-text-font-size, + $kendo-fab-item-text-line-height: $kendo-fab-item-text-line-height, + $kendo-fab-item-icon-padding-x: $kendo-fab-item-icon-padding-x, + $kendo-fab-item-icon-padding-y: $kendo-fab-item-icon-padding-y, + $kendo-fab-item-icon-border-width: $kendo-fab-item-icon-border-width, + $kendo-fab-item-icon-border-radius: $kendo-fab-item-icon-border-radius, + $kendo-fab-theme-colors: $kendo-fab-theme-colors, + $kendo-fab-sizes: $kendo-fab-sizes, + $kendo-fab-shadow: $kendo-fab-shadow, + $kendo-fab-disabled-shadow: $kendo-fab-disabled-shadow, + $kendo-fab-active-shadow: $kendo-fab-active-shadow, + $kendo-fab-outline-style: $kendo-fab-outline-style, + $kendo-fab-outline-width: $kendo-fab-outline-width, + $kendo-fab-item-text: $kendo-fab-item-text, + $kendo-fab-item-bg: $kendo-fab-item-bg, + $kendo-fab-item-border: $kendo-fab-item-border, + $kendo-fab-item-icon-text: $kendo-fab-item-icon-text, + $kendo-fab-item-icon-bg: $kendo-fab-item-icon-bg, + $kendo-fab-item-icon-border: $kendo-fab-item-icon-border, + $kendo-fab-item-shadow: $kendo-fab-item-shadow, + $kendo-fab-item-disabled-shadow: $kendo-fab-item-disabled-shadow, + $kendo-fab-item-active-shadow: $kendo-fab-item-active-shadow, + $kendo-fab-item-outline-style: $kendo-fab-item-outline-style, + $kendo-fab-item-outline-width: $kendo-fab-item-outline-width, + $kendo-fab-item-outline-color: $kendo-fab-item-outline-color +); diff --git a/packages/bootstrap/scss/filemanager/_index.scss b/packages/bootstrap/scss/filemanager/_index.scss index 66012b2b4ca..a0498d96ca9 100644 --- a/packages/bootstrap/scss/filemanager/_index.scss +++ b/packages/bootstrap/scss/filemanager/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @@ -20,8 +21,20 @@ // Expose -@mixin filemanager-styles() { - @include import-once( "filemanager" ) { +@mixin kendo-file-manager--styles() { + @include import-once( "file-manager" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-toolbar--styles(); + @include kendo-upload--styles(); + @include kendo-switch--styles(); + @include kendo-menu--styles(); + @include kendo-dialog--styles(); + @include kendo-breadcrumb--styles(); + @include kendo-treeview--styles(); + @include kendo-splitter--styles(); + @include kendo-grid--styles(); + @include kendo-listview--styles(); @include kendo-file-manager--layout(); @include kendo-file-manager--theme(); } diff --git a/packages/bootstrap/scss/filemanager/_layout.scss b/packages/bootstrap/scss/filemanager/_layout.scss index ced9e34f232..fed22ec3a31 100644 --- a/packages/bootstrap/scss/filemanager/_layout.scss +++ b/packages/bootstrap/scss/filemanager/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/filemanager/_layout.scss"; +@use "@progress/kendo-theme-default/scss/filemanager/_layout.scss" as *; @mixin kendo-file-manager--layout() { diff --git a/packages/bootstrap/scss/filemanager/_theme.scss b/packages/bootstrap/scss/filemanager/_theme.scss index 70a0a606ee6..623163832a7 100644 --- a/packages/bootstrap/scss/filemanager/_theme.scss +++ b/packages/bootstrap/scss/filemanager/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/filemanager/_theme.scss"; +@use "@progress/kendo-theme-default/scss/filemanager/_theme.scss" as *; @mixin kendo-file-manager--theme() { diff --git a/packages/bootstrap/scss/filemanager/_variables.scss b/packages/bootstrap/scss/filemanager/_variables.scss index 7946e94d087..7f25d90ef99 100644 --- a/packages/bootstrap/scss/filemanager/_variables.scss +++ b/packages/bootstrap/scss/filemanager/_variables.scss @@ -184,3 +184,64 @@ $kendo-file-manager-preview-icon-text: if($kendo-enable-color-system, k-color( s /// The border color of the FileManager preview icon. /// @group file-manager $kendo-file-manager-preview-icon-border: null !default; + + +@forward "@progress/kendo-theme-default/scss/filemanager/_variables.scss" with ( + $kendo-file-manager-spacer: $kendo-file-manager-spacer, + $kendo-file-manager-border-width: $kendo-file-manager-border-width, + $kendo-file-manager-font-family: $kendo-file-manager-font-family, + $kendo-file-manager-font-size: $kendo-file-manager-font-size, + $kendo-file-manager-line-height: $kendo-file-manager-line-height, + $kendo-file-manager-bg: $kendo-file-manager-bg, + $kendo-file-manager-text: $kendo-file-manager-text, + $kendo-file-manager-border: $kendo-file-manager-border, + $kendo-file-manager-toolbar-border-width: $kendo-file-manager-toolbar-border-width, + $kendo-file-manager-toolbar-bg: $kendo-file-manager-toolbar-bg, + $kendo-file-manager-toolbar-text: $kendo-file-manager-toolbar-text, + $kendo-file-manager-toolbar-border: $kendo-file-manager-toolbar-border, + $kendo-file-manager-toolbar-gradient: $kendo-file-manager-toolbar-gradient, + $kendo-file-manager-navigation-padding-x: $kendo-file-manager-navigation-padding-x, + $kendo-file-manager-navigation-padding-y: $kendo-file-manager-navigation-padding-y, + $kendo-file-manager-navigation-width: $kendo-file-manager-navigation-width, + $kendo-file-manager-navigation-border-width: $kendo-file-manager-navigation-border-width, + $kendo-file-manager-navigation-bg: $kendo-file-manager-navigation-bg, + $kendo-file-manager-navigation-text: $kendo-file-manager-navigation-text, + $kendo-file-manager-navigation-border: $kendo-file-manager-navigation-border, + $kendo-file-manager-breadcrumb-padding-x: $kendo-file-manager-breadcrumb-padding-x, + $kendo-file-manager-breadcrumb-padding-y: $kendo-file-manager-breadcrumb-padding-y, + $kendo-file-manager-breadcrumb-border-width: $kendo-file-manager-breadcrumb-border-width, + $kendo-file-manager-breadcrumb-bg: $kendo-file-manager-breadcrumb-bg, + $kendo-file-manager-breadcrumb-text: $kendo-file-manager-breadcrumb-text, + $kendo-file-manager-breadcrumb-border: $kendo-file-manager-breadcrumb-border, + $kendo-file-manager-listview-bg: $kendo-file-manager-listview-bg, + $kendo-file-manager-listview-text: $kendo-file-manager-listview-text, + $kendo-file-manager-listview-border: $kendo-file-manager-listview-border, + $kendo-file-manager-listview-item-padding-x: $kendo-file-manager-listview-item-padding-x, + $kendo-file-manager-listview-item-padding-y: $kendo-file-manager-listview-item-padding-y, + $kendo-file-manager-listview-item-width: $kendo-file-manager-listview-item-width, + $kendo-file-manager-listview-item-height: $kendo-file-manager-listview-item-height, + $kendo-file-manager-listview-item-bg: $kendo-file-manager-listview-item-bg, + $kendo-file-manager-listview-item-text: $kendo-file-manager-listview-item-text, + $kendo-file-manager-listview-item-border: $kendo-file-manager-listview-item-border, + $kendo-file-manager-listview-item-icon-bg: $kendo-file-manager-listview-item-icon-bg, + $kendo-file-manager-listview-item-icon-text: $kendo-file-manager-listview-item-icon-text, + $kendo-file-manager-listview-item-icon-border: $kendo-file-manager-listview-item-icon-border, + $kendo-file-manager-listview-item-icon-selected-bg: $kendo-file-manager-listview-item-icon-selected-bg, + $kendo-file-manager-listview-item-icon-selected-text: $kendo-file-manager-listview-item-icon-selected-text, + $kendo-file-manager-listview-item-icon-selected-border: $kendo-file-manager-listview-item-icon-selected-border, + $kendo-file-manager-grid-bg: $kendo-file-manager-grid-bg, + $kendo-file-manager-grid-text: $kendo-file-manager-grid-text, + $kendo-file-manager-grid-border: $kendo-file-manager-grid-border, + $kendo-file-manager-preview-padding-x: $kendo-file-manager-preview-padding-x, + $kendo-file-manager-preview-padding-y: $kendo-file-manager-preview-padding-y, + $kendo-file-manager-preview-width: $kendo-file-manager-preview-width, + $kendo-file-manager-preview-border-width: $kendo-file-manager-preview-border-width, + $kendo-file-manager-preview-spacing: $kendo-file-manager-preview-spacing, + $kendo-file-manager-preview-column-gap: $kendo-file-manager-preview-column-gap, + $kendo-file-manager-preview-bg: $kendo-file-manager-preview-bg, + $kendo-file-manager-preview-text: $kendo-file-manager-preview-text, + $kendo-file-manager-preview-border: $kendo-file-manager-preview-border, + $kendo-file-manager-preview-icon-bg: $kendo-file-manager-preview-icon-bg, + $kendo-file-manager-preview-icon-text: $kendo-file-manager-preview-icon-text, + $kendo-file-manager-preview-icon-border: $kendo-file-manager-preview-icon-border +); diff --git a/packages/bootstrap/scss/filter/_index.scss b/packages/bootstrap/scss/filter/_index.scss index 34eb10c1edf..8a3e589f234 100644 --- a/packages/bootstrap/scss/filter/_index.scss +++ b/packages/bootstrap/scss/filter/_index.scss @@ -4,7 +4,6 @@ @use "./_theme.scss" as *; - // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @@ -17,8 +16,16 @@ // Expose -@mixin filter-styles() { +@mixin kendo-filter--styles() { @include import-once( "filter" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-input--styles(); + @include kendo-checkbox--styles(); + @include kendo-date-time-picker--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-numeric-textbox--styles(); + @include kendo-toolbar--styles(); @include kendo-filter--layout(); @include kendo-filter--theme(); } diff --git a/packages/bootstrap/scss/filter/_layout.scss b/packages/bootstrap/scss/filter/_layout.scss index f86f8ffd975..17ad23dc713 100644 --- a/packages/bootstrap/scss/filter/_layout.scss +++ b/packages/bootstrap/scss/filter/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/filter/_layout.scss"; +@use "@progress/kendo-theme-default/scss/filter/_layout.scss" as *; @mixin kendo-filter--layout() { diff --git a/packages/bootstrap/scss/filter/_theme.scss b/packages/bootstrap/scss/filter/_theme.scss index b10096d80ed..045cb73a92b 100644 --- a/packages/bootstrap/scss/filter/_theme.scss +++ b/packages/bootstrap/scss/filter/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/filter/_theme.scss"; +@use "@progress/kendo-theme-default/scss/filter/_theme.scss" as *; @mixin kendo-filter--theme() { diff --git a/packages/bootstrap/scss/filter/_variables.scss b/packages/bootstrap/scss/filter/_variables.scss index 03a16f65789..a5ab8190803 100644 --- a/packages/bootstrap/scss/filter/_variables.scss +++ b/packages/bootstrap/scss/filter/_variables.scss @@ -1,15 +1,15 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; // Filter expression builder /// The horizontal padding of the Filter. /// @group filter -$kendo-filter-padding-x: $kendo-padding-md-x !default; +$kendo-filter-padding-x: k-spacing(4) !default; /// The vertical padding of the Filter. /// @group filter -$kendo-filter-padding-y: $kendo-padding-md-y !default; +$kendo-filter-padding-y: k-spacing(2) !default; /// The bottom margin of the Filter. /// @group filter @@ -32,3 +32,15 @@ $kendo-filter-preview-operator-text: $kendo-subtle-text !default; /// The box shadow of the focused Filter toolbar. /// @group filter $kendo-filter-toolbar-focus-shadow: 0 0 0 .25rem if($kendo-enable-color-system, color-mix(in srgb, k-color( primary ) 25%, transparent), rgba( $kendo-color-primary, .25 )) !default; + + +@forward "@progress/kendo-theme-default/scss/filter/_variables.scss" with ( + $kendo-filter-padding-x: $kendo-filter-padding-x, + $kendo-filter-padding-y: $kendo-filter-padding-y, + $kendo-filter-bottom-margin: $kendo-filter-bottom-margin, + $kendo-filter-line-size: $kendo-filter-line-size, + $kendo-filter-operator-dropdown-width: $kendo-filter-operator-dropdown-width, + $kendo-filter-preview-field-text: $kendo-filter-preview-field-text, + $kendo-filter-preview-operator-text: $kendo-filter-preview-operator-text, + $kendo-filter-toolbar-focus-shadow: $kendo-filter-toolbar-focus-shadow +); diff --git a/packages/bootstrap/scss/floating-label/_index.scss b/packages/bootstrap/scss/floating-label/_index.scss index f8a6d628f1e..bfedf7dfaa9 100644 --- a/packages/bootstrap/scss/floating-label/_index.scss +++ b/packages/bootstrap/scss/floating-label/_index.scss @@ -3,14 +3,17 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; // Expose -@mixin floating-label-styles() { +@mixin kendo-floating-label--styles() { @include import-once( "floating-label" ) { + @include core-styles(); + @include kendo-input--styles(); @include kendo-floating-label--layout(); @include kendo-floating-label--theme(); } diff --git a/packages/bootstrap/scss/floating-label/_layout.scss b/packages/bootstrap/scss/floating-label/_layout.scss index f4b7be7c794..6c80abfa677 100644 --- a/packages/bootstrap/scss/floating-label/_layout.scss +++ b/packages/bootstrap/scss/floating-label/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/floating-label/_layout.scss"; +@use "@progress/kendo-theme-default/scss/floating-label/_layout.scss" as *; @mixin kendo-floating-label--layout() { diff --git a/packages/bootstrap/scss/floating-label/_theme.scss b/packages/bootstrap/scss/floating-label/_theme.scss index 7155dc523ca..6c7a00b33c9 100644 --- a/packages/bootstrap/scss/floating-label/_theme.scss +++ b/packages/bootstrap/scss/floating-label/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/floating-label/_theme.scss"; +@use "@progress/kendo-theme-default/scss/floating-label/_theme.scss" as *; @mixin kendo-floating-label--theme() { diff --git a/packages/bootstrap/scss/floating-label/_variables.scss b/packages/bootstrap/scss/floating-label/_variables.scss index dcf7e62892e..214d0960bb3 100644 --- a/packages/bootstrap/scss/floating-label/_variables.scss +++ b/packages/bootstrap/scss/floating-label/_variables.scss @@ -53,3 +53,22 @@ $kendo-floating-label-focus-bg: null !default; /// The text color of the focused Floating Label. /// @group floating-label $kendo-floating-label-focus-text: null !default; + + +@forward "@progress/kendo-theme-default/scss/floating-label/_variables.scss" with ( + $kendo-floating-label-scale: $kendo-floating-label-scale, + $kendo-floating-label-font-size: $kendo-floating-label-font-size, + $kendo-floating-label-max-width: $kendo-floating-label-max-width, + $kendo-floating-label-line-height: $kendo-floating-label-line-height, + $kendo-floating-label-height: $kendo-floating-label-height, + $kendo-floating-label-offset-x: $kendo-floating-label-offset-x, + $kendo-floating-label-offset-y: $kendo-floating-label-offset-y, + $kendo-floating-label-focus-scale: $kendo-floating-label-focus-scale, + $kendo-floating-label-focus-offset-x: $kendo-floating-label-focus-offset-x, + $kendo-floating-label-focus-offset-y: $kendo-floating-label-focus-offset-y, + $kendo-floating-label-transition: $kendo-floating-label-transition, + $kendo-floating-label-bg: $kendo-floating-label-bg, + $kendo-floating-label-text: $kendo-floating-label-text, + $kendo-floating-label-focus-bg: $kendo-floating-label-focus-bg, + $kendo-floating-label-focus-text: $kendo-floating-label-focus-text +); diff --git a/packages/bootstrap/scss/forms/_index.scss b/packages/bootstrap/scss/forms/_index.scss index 9edf3383764..6046b40e00f 100644 --- a/packages/bootstrap/scss/forms/_index.scss +++ b/packages/bootstrap/scss/forms/_index.scss @@ -4,17 +4,21 @@ @use "./_theme.scss" as *; -// Dependencies +// Dependencies // TODO: extract variables @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @use "../toolbar/_index.scss" as *; @use "../action-buttons/_index.scss" as *; + // Expose -@mixin forms-styles() { - @include import-once( "forms" ) { - @include kendo-forms--layout(); - @include kendo-forms--theme(); +@mixin kendo-form--styles() { + @include import-once( "form" ) { + @include core-styles(); + @include kendo-toolbar--styles(); + @include kendo-action-buttons--styles(); + @include kendo-form--layout(); + @include kendo-form--theme(); @include kendo-utils--layout--display(); @include kendo-utils--flex-grid--gap(); @include kendo-utils--flex-grid--grid-template-columns(); diff --git a/packages/bootstrap/scss/forms/_layout.scss b/packages/bootstrap/scss/forms/_layout.scss index c562d317458..f9001a13ec6 100644 --- a/packages/bootstrap/scss/forms/_layout.scss +++ b/packages/bootstrap/scss/forms/_layout.scss @@ -1,11 +1,11 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../input/_variables.scss" as *; @use "../window/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/forms/_layout.scss"; +@use "@progress/kendo-theme-default/scss/forms/_layout.scss" as *; @mixin kendo-form--layout() { @@ -28,12 +28,12 @@ .k-form { legend { - margin-bottom: $kendo-padding-md-y; + margin-bottom: k-spacing(2); } .k-field-info { margin-block: 0; - margin-inline: calc( #{$kendo-padding-md-x} / 2 ); + margin-inline: calc( #{k-spacing(4)} / 2 ); } } @@ -44,14 +44,14 @@ .k-form-field { > span:not(.k-widget) { - padding: calc( #{$kendo-padding-md-y} - #{$kendo-input-border-width} ) 0; - padding-right: $kendo-padding-md-x; + padding: calc( #{k-spacing(4)} - #{$kendo-input-border-width} ) 0; + padding-right: k-spacing(4); } } } .k-edit-label { - padding: calc( #{$kendo-padding-md-y} - #{$kendo-input-border-width} ) 0; + padding: calc( #{k-spacing(2)} - #{$kendo-input-border-width} ) 0; } } diff --git a/packages/bootstrap/scss/forms/_theme.scss b/packages/bootstrap/scss/forms/_theme.scss index abdb13de4f1..2e20a4d0179 100644 --- a/packages/bootstrap/scss/forms/_theme.scss +++ b/packages/bootstrap/scss/forms/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/forms/_theme.scss"; +@use "@progress/kendo-theme-default/scss/forms/_theme.scss" as *; @mixin kendo-form--theme() { diff --git a/packages/bootstrap/scss/forms/_variables.scss b/packages/bootstrap/scss/forms/_variables.scss index 1d87bb3a3fc..5d08c9aa726 100644 --- a/packages/bootstrap/scss/forms/_variables.scss +++ b/packages/bootstrap/scss/forms/_variables.scss @@ -1,13 +1,16 @@ +@use "sass:map"; +@use "../core/_index.scss" as *; @use "../input/_variables.scss" as *; @use "../tooltip/_variables.scss" as *; @use "../typography/_variables.scss" as *; @use "../window/_variables.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // Forms /// The padding of the inline Form. /// @group form -$kendo-form-spacer: calc( #{$kendo-padding-md-x} * 2 ) !default; +$kendo-form-spacer: calc( #{k-spacing(4)} * 2 ) !default; /// The font size of the Form. /// @group form @@ -168,3 +171,52 @@ $kendo-form-sizes: ( form-rows-spacing: $kendo-form-lg-rows-spacing ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/forms/_variables.scss" with ( + $kendo-form-spacer: $kendo-form-spacer, + $kendo-form-font-size: $kendo-form-font-size, + $kendo-form-line-height: $kendo-form-line-height, + $kendo-form-line-height-em: $kendo-form-line-height-em, + $kendo-form-sm-line-height: $kendo-form-sm-line-height, + $kendo-form-lg-line-height: $kendo-form-lg-line-height, + $kendo-form-fieldset-margin: $kendo-form-fieldset-margin, + $kendo-form-fieldset-padding: $kendo-form-fieldset-padding, + $kendo-form-legend-margin: $kendo-form-legend-margin, + $kendo-form-legend-padding: $kendo-form-legend-padding, + $kendo-form-legend-border-width: $kendo-form-legend-border-width, + $kendo-form-legend-border-style: $kendo-form-legend-border-style, + $kendo-form-legend-border-color: $kendo-form-legend-border-color, + $kendo-form-legend-width: $kendo-form-legend-width, + $kendo-form-legend-font-size: $kendo-form-legend-font-size, + $kendo-form-legend-text-transform: $kendo-form-legend-text-transform, + $kendo-form-label-margin-bottom: $kendo-form-label-margin-bottom, + $kendo-form-button-margin-x: $kendo-form-button-margin-x, + $kendo-form-hint-font-size: $kendo-form-hint-font-size, + $kendo-form-hint-font-style: $kendo-form-hint-font-style, + $kendo-form-hint-margin-top: $kendo-form-hint-margin-top, + $kendo-form-sm-rows-spacing: $kendo-form-sm-rows-spacing, + $kendo-form-md-rows-spacing: $kendo-form-md-rows-spacing, + $kendo-form-lg-rows-spacing: $kendo-form-lg-rows-spacing, + $kendo-form-separator-margin: $kendo-form-separator-margin, + $kendo-form-separator-border-color: $kendo-form-separator-border-color, + $kendo-horizontal-form-label-padding-top: $kendo-horizontal-form-label-padding-top, + $kendo-horizontal-form-label-margin-x: $kendo-horizontal-form-label-margin-x, + $kendo-horizontal-form-label-width: $kendo-horizontal-form-label-width, + $kendo-horizontal-form-label-align: $kendo-horizontal-form-label-align, + $kendo-horizontal-form-field-wrap-max-width: $kendo-horizontal-form-field-wrap-max-width, + $kendo-inline-form-element-width: $kendo-inline-form-element-width, + $kendo-forms-invalid-color: $kendo-forms-invalid-color, + $kendo-label-optional-margin-x: $kendo-label-optional-margin-x, + $kendo-label-optional-font-size: $kendo-label-optional-font-size, + $kendo-label-optional-font-style: $kendo-label-optional-font-style, + $kendo-fieldset-margin: $kendo-fieldset-margin, + $kendo-fieldset-font-size: $kendo-fieldset-font-size, + $kendo-fieldset-bg: $kendo-fieldset-bg, + $kendo-fieldset-text: $kendo-fieldset-text, + $kendo-fieldset-border: $kendo-fieldset-border, + $kendo-fieldset-legend-bg: $kendo-fieldset-legend-bg, + $kendo-fieldset-legend-text: $kendo-fieldset-legend-text, + $kendo-fieldset-legend-border: $kendo-fieldset-legend-border, + $kendo-form-sizes: $kendo-form-sizes +); diff --git a/packages/bootstrap/scss/gantt/_index.scss b/packages/bootstrap/scss/gantt/_index.scss index 25529211dd6..2ba11ad8d14 100644 --- a/packages/bootstrap/scss/gantt/_index.scss +++ b/packages/bootstrap/scss/gantt/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -17,8 +18,17 @@ // Expose -@mixin gantt-styles() { +@mixin kendo-gantt--styles() { @include import-once( "gantt" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-input--styles(); + @include kendo-validator--styles(); + @include kendo-date-time-picker--styles(); + @include kendo-numeric-textbox--styles(); + @include kendo-window--styles(); + @include kendo-splitter--styles(); + @include kendo-treelist--styles(); @include kendo-gantt--layout(); @include kendo-gantt--theme(); @include kendo-utils--typography--white-space(); diff --git a/packages/bootstrap/scss/gantt/_layout.scss b/packages/bootstrap/scss/gantt/_layout.scss index b9ddcfb8b7b..9f5e0fd4703 100644 --- a/packages/bootstrap/scss/gantt/_layout.scss +++ b/packages/bootstrap/scss/gantt/_layout.scss @@ -1,11 +1,11 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../table/_variables.scss" as *; @use "../grid/_variables.scss" as *; @use "../toolbar/_variables.scss" as *; @use "../button/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/gantt/_layout.scss"; +@use "@progress/kendo-theme-default/scss/gantt/_layout.scss" as *; @mixin kendo-gantt--layout() { diff --git a/packages/bootstrap/scss/gantt/_theme.scss b/packages/bootstrap/scss/gantt/_theme.scss index 1c8b918ff13..b0da02c9d4e 100644 --- a/packages/bootstrap/scss/gantt/_theme.scss +++ b/packages/bootstrap/scss/gantt/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/gantt/_theme.scss"; +@use "@progress/kendo-theme-default/scss/gantt/_theme.scss" as *; @mixin kendo-gantt--theme() { diff --git a/packages/bootstrap/scss/gantt/_variables.scss b/packages/bootstrap/scss/gantt/_variables.scss index 20a75ba395e..01c63f7bcde 100644 --- a/packages/bootstrap/scss/gantt/_variables.scss +++ b/packages/bootstrap/scss/gantt/_variables.scss @@ -1,4 +1,4 @@ -@use "sass:map"; +@use "../core/_index.scss" as *; // Gantt @@ -238,3 +238,79 @@ $kendo-gantt-validation-tooltip-valid-border: $kendo-color-success !default; /// The border color of the invalid Gantt validation Tooltip. /// @group gantt $kendo-gantt-validation-tooltip-invalid-border: $kendo-color-error !default; + + +@forward "@progress/kendo-theme-default/scss/gantt/_variables.scss" with ( + $kendo-gantt-border-width: $kendo-gantt-border-width, + $kendo-gantt-font-family: $kendo-gantt-font-family, + $kendo-gantt-font-size: $kendo-gantt-font-size, + $kendo-gantt-line-height: $kendo-gantt-line-height, + $kendo-gantt-bg: $kendo-gantt-bg, + $kendo-gantt-text: $kendo-gantt-text, + $kendo-gantt-border: $kendo-gantt-border, + $kendo-gantt-treelist-bg: $kendo-gantt-treelist-bg, + $kendo-gantt-treelist-text: $kendo-gantt-treelist-text, + $kendo-gantt-treelist-border: $kendo-gantt-treelist-border, + $kendo-gantt-nonwork-bg: $kendo-gantt-nonwork-bg, + $kendo-gantt-nonwork-text: $kendo-gantt-nonwork-text, + $kendo-gantt-nonwork-border: $kendo-gantt-nonwork-border, + $kendo-gantt-line-size: $kendo-gantt-line-size, + $kendo-gantt-line-fill: $kendo-gantt-line-fill, + $kendo-gantt-line-selected-fill: $kendo-gantt-line-selected-fill, + $kendo-gantt-dot-size: $kendo-gantt-dot-size, + $kendo-gantt-dot-spacing: $kendo-gantt-dot-spacing, + $kendo-gantt-dot-bg: $kendo-gantt-dot-bg, + $kendo-gantt-dot-border: $kendo-gantt-dot-border, + $kendo-gantt-dot-hover-bg: $kendo-gantt-dot-hover-bg, + $kendo-gantt-dot-hover-border: $kendo-gantt-dot-hover-border, + $kendo-gantt-milestone-bg: $kendo-gantt-milestone-bg, + $kendo-gantt-milestone-border: $kendo-gantt-milestone-border, + $kendo-gantt-milestone-selected-bg: $kendo-gantt-milestone-selected-bg, + $kendo-gantt-milestone-selected-border: $kendo-gantt-milestone-selected-border, + $kendo-gantt-summary-bg: $kendo-gantt-summary-bg, + $kendo-gantt-summary-progress-bg: $kendo-gantt-summary-progress-bg, + $kendo-gantt-summary-selected-bg: $kendo-gantt-summary-selected-bg, + $kendo-gantt-summary-progress-selected-bg: $kendo-gantt-summary-progress-selected-bg, + $kendo-gantt-task-padding-x: $kendo-gantt-task-padding-x, + $kendo-gantt-task-padding-y: $kendo-gantt-task-padding-y, + $kendo-gantt-task-border-width: $kendo-gantt-task-border-width, + $kendo-gantt-task-bg: $kendo-gantt-task-bg, + $kendo-gantt-task-text: $kendo-gantt-task-text, + $kendo-gantt-task-border: $kendo-gantt-task-border, + $kendo-gantt-task-progress-bg: $kendo-gantt-task-progress-bg, + $kendo-gantt-task-selected-bg: $kendo-gantt-task-selected-bg, + $kendo-gantt-task-selected-text: $kendo-gantt-task-selected-text, + $kendo-gantt-task-selected-border: $kendo-gantt-task-selected-border, + $kendo-gantt-task-progress-selected-bg: $kendo-gantt-task-progress-selected-bg, + $kendo-gantt-planned-margin-y: $kendo-gantt-planned-margin-y, + $kendo-gantt-planned-border-width: $kendo-gantt-planned-border-width, + $kendo-gantt-planned-line-height: $kendo-gantt-planned-line-height, + $kendo-gantt-planned-dependency-margin-y: $kendo-gantt-planned-dependency-margin-y, + $kendo-gantt-planned-moment-width: $kendo-gantt-planned-moment-width, + $kendo-gantt-planned-moment-height: $kendo-gantt-planned-moment-height, + $kendo-gantt-planned-moment-border-radius: $kendo-gantt-planned-moment-border-radius, + $kendo-gantt-planned-moment-left-margin-x: $kendo-gantt-planned-moment-left-margin-x, + $kendo-gantt-planned-milestone-moment-margin-x: $kendo-gantt-planned-milestone-moment-margin-x, + $kendo-gantt-planned-duration-height: $kendo-gantt-planned-duration-height, + $kendo-gantt-planned-duration-hover-height: $kendo-gantt-planned-duration-hover-height, + $kendo-gantt-planned-single-drag-hint-top: $kendo-gantt-planned-single-drag-hint-top, + $kendo-gantt-planned-summary-drag-hint-top: $kendo-gantt-planned-summary-drag-hint-top, + $kendo-gantt-planned-milestone-drag-hint-top: $kendo-gantt-planned-milestone-drag-hint-top, + $kendo-gantt-rtl-milestone-wrap-margin-x: $kendo-gantt-rtl-milestone-wrap-margin-x, + $kendo-gantt-rtl-milestone-planned-moment-margin-x: $kendo-gantt-rtl-milestone-planned-moment-margin-x, + $kendo-gantt-rtl-milestone-dot-start-margin-x: $kendo-gantt-rtl-milestone-dot-start-margin-x, + $kendo-gantt-planned-offset-resize-handler-margin-x: $kendo-gantt-planned-offset-resize-handler-margin-x, + $kendo-gantt-planned-bg: $kendo-gantt-planned-bg, + $kendo-gantt-planned-border: $kendo-gantt-planned-border, + $kendo-gantt-delayed-bg: $kendo-gantt-delayed-bg, + $kendo-gantt-delayed-bg-lighter: $kendo-gantt-delayed-bg-lighter, + $kendo-gantt-advanced-bg: $kendo-gantt-advanced-bg, + $kendo-gantt-advanced-bg-lighter: $kendo-gantt-advanced-bg-lighter, + $kendo-gantt-action-on-offset-text: $kendo-gantt-action-on-offset-text, + $kendo-gantt-offset-resize-handler-top: $kendo-gantt-offset-resize-handler-top, + $kendo-gantt-validation-tooltip-width: $kendo-gantt-validation-tooltip-width, + $kendo-gantt-validation-tooltip-label-width: $kendo-gantt-validation-tooltip-label-width, + $kendo-gantt-validation-tooltip-border: $kendo-gantt-validation-tooltip-border, + $kendo-gantt-validation-tooltip-valid-border: $kendo-gantt-validation-tooltip-valid-border, + $kendo-gantt-validation-tooltip-invalid-border: $kendo-gantt-validation-tooltip-invalid-border +); diff --git a/packages/bootstrap/scss/grid/_index.scss b/packages/bootstrap/scss/grid/_index.scss index 7da59100ef3..1efe5cda727 100644 --- a/packages/bootstrap/scss/grid/_index.scss +++ b/packages/bootstrap/scss/grid/_index.scss @@ -32,8 +32,31 @@ // Expose -@mixin grid-styles() { +@mixin kendo-grid--styles() { @include import-once( "grid" ) { + @include core-styles(); + @include kendo-adaptive--styles(); + @include kendo-progressbar--styles(); + @include kendo-button--styles(); + @include kendo-action-buttons--styles(); + @include kendo-toolbar--styles(); + @include kendo-input--styles(); + @include kendo-textbox--styles(); + @include kendo-checkbox--styles(); + @include kendo-radio--styles(); + @include kendo-validator--styles(); + @include kendo-autocomplete--styles(); + @include kendo-date-time-picker--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-numeric-textbox--styles(); + @include kendo-menu--styles(); + @include kendo-dialog--styles(); + @include kendo-pager--styles(); + @include kendo-chip--styles(); + @include kendo-skeleton--styles(); + @include kendo-list--styles(); + @include kendo-table--styles(); + @include kendo-tabstrip--styles(); @include kendo-grid--layout(); @include kendo-grid--theme(); @include kendo-utils--interactivity--touch-action(); diff --git a/packages/bootstrap/scss/grid/_layout.scss b/packages/bootstrap/scss/grid/_layout.scss index 33d07e20627..83f224253e7 100644 --- a/packages/bootstrap/scss/grid/_layout.scss +++ b/packages/bootstrap/scss/grid/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/grid/_layout.scss"; +@use "@progress/kendo-theme-default/scss/grid/_layout.scss" as *; @mixin kendo-grid--layout() { diff --git a/packages/bootstrap/scss/grid/_theme.scss b/packages/bootstrap/scss/grid/_theme.scss index 32a23cc71ce..9b41612444b 100644 --- a/packages/bootstrap/scss/grid/_theme.scss +++ b/packages/bootstrap/scss/grid/_theme.scss @@ -1,4 +1,8 @@ -@import "@progress/kendo-theme-default/scss/grid/_theme.scss"; +@use "../core/_index.scss" as *; +@use "./_variables.scss" as *; +@use "../list/_variables.scss" as *; +@use "../popup/_variables.scss" as *; +@use "@progress/kendo-theme-default/scss/grid/_theme.scss" as *; @mixin kendo-grid--theme() { diff --git a/packages/bootstrap/scss/grid/_variables.scss b/packages/bootstrap/scss/grid/_variables.scss index 71ea3446365..00d95ddc7f5 100644 --- a/packages/bootstrap/scss/grid/_variables.scss +++ b/packages/bootstrap/scss/grid/_variables.scss @@ -1,3 +1,12 @@ +@use "../core/_index.scss" as *; +@use "../table/_variables.scss" as *; +@use "../chip/_variables.scss" as *; +@use "../button/_variables.scss" as *; +@use "../icon/_variables.scss" as *; +@use "../menu/_variables.scss" as *; +@use "../list/_variables.scss" as *; +@use "../popup/_variables.scss" as *; + // Grid $kendo-grid-border-width: 1px !default; $kendo-grid-font-family: var( --kendo-font-family, inherit ) !default; @@ -229,7 +238,7 @@ $kendo-grid-sorting-index-height: $kendo-icon-size !default; $kendo-grid-sorting-index-spacing-y: k-spacing(0.5) !default; $kendo-grid-sorting-index-spacing-x: calc( #{$kendo-grid-sorting-index-spacing-y} * -1 ) !default; -$kendo-grid-sorted-icon-spacing: calc( #{$kendo-padding-md-x} - 1px ) !default; +$kendo-grid-sorted-icon-spacing: calc( #{k-spacing(4)} - 1px ) !default; $kendo-grid-focus-shadow: $kendo-table-focus-shadow !default; @@ -315,3 +324,150 @@ $kendo-grid-row-resizer-active-bg: $kendo-color-primary !default; /// The height of the Grid row resize indicator. /// @group grid $kendo-grid-row-resizer-height: k-spacing(0.5) !default; + + +@forward "@progress/kendo-theme-default/scss/grid/_variables.scss" with ( + $kendo-grid-border-width: $kendo-grid-border-width, + $kendo-grid-font-family: $kendo-grid-font-family, + $kendo-grid-font-size: $kendo-grid-font-size, + $kendo-grid-line-height: $kendo-grid-line-height, + $kendo-grid-padding-x: $kendo-grid-padding-x, + $kendo-grid-padding-y: $kendo-grid-padding-y, + $kendo-grid-header-padding-x: $kendo-grid-header-padding-x, + $kendo-grid-header-padding-y: $kendo-grid-header-padding-y, + $kendo-grid-grouping-header-padding-x: $kendo-grid-grouping-header-padding-x, + $kendo-grid-grouping-header-padding-y: $kendo-grid-grouping-header-padding-y, + $kendo-grid-cell-padding-x: $kendo-grid-cell-padding-x, + $kendo-grid-cell-padding-y: $kendo-grid-cell-padding-y, + $kendo-grid-filter-cell-padding-x: $kendo-grid-filter-cell-padding-x, + $kendo-grid-filter-cell-padding-y: $kendo-grid-filter-cell-padding-y, + $kendo-grid-edit-cell-padding-x: $kendo-grid-edit-cell-padding-x, + $kendo-grid-edit-cell-padding-y: $kendo-grid-edit-cell-padding-y, + $kendo-grid-group-drop-hint-size: $kendo-grid-group-drop-hint-size, + $kendo-grid-group-drop-hint-line-size: $kendo-grid-group-drop-hint-line-size, + $kendo-grid-group-drop-hint-height: $kendo-grid-group-drop-hint-height, + $kendo-grid-group-drop-hint-top: $kendo-grid-group-drop-hint-top, + $kendo-grid-sm-padding-x: $kendo-grid-sm-padding-x, + $kendo-grid-sm-padding-y: $kendo-grid-sm-padding-y, + $kendo-grid-sm-header-padding-x: $kendo-grid-sm-header-padding-x, + $kendo-grid-sm-header-padding-y: $kendo-grid-sm-header-padding-y, + $kendo-grid-sm-grouping-header-padding-x: $kendo-grid-sm-grouping-header-padding-x, + $kendo-grid-sm-grouping-header-padding-y: $kendo-grid-sm-grouping-header-padding-y, + $kendo-grid-sm-cell-padding-x: $kendo-grid-sm-cell-padding-x, + $kendo-grid-sm-cell-padding-y: $kendo-grid-sm-cell-padding-y, + $kendo-grid-sm-filter-cell-padding-x: $kendo-grid-sm-filter-cell-padding-x, + $kendo-grid-sm-filter-cell-padding-y: $kendo-grid-sm-filter-cell-padding-y, + $kendo-grid-sm-edit-cell-padding-x: $kendo-grid-sm-edit-cell-padding-x, + $kendo-grid-sm-edit-cell-padding-y: $kendo-grid-sm-edit-cell-padding-y, + $kendo-grid-sm-group-dropclue-height: $kendo-grid-sm-group-dropclue-height, + $kendo-grid-sm-selection-aggregates-padding-x: $kendo-grid-sm-selection-aggregates-padding-x, + $kendo-grid-sm-selection-aggregates-padding-y: $kendo-grid-sm-selection-aggregates-padding-y, + $kendo-grid-md-padding-x: $kendo-grid-md-padding-x, + $kendo-grid-md-padding-y: $kendo-grid-md-padding-y, + $kendo-grid-md-header-padding-x: $kendo-grid-md-header-padding-x, + $kendo-grid-md-header-padding-y: $kendo-grid-md-header-padding-y, + $kendo-grid-md-grouping-header-padding-x: $kendo-grid-md-grouping-header-padding-x, + $kendo-grid-md-grouping-header-padding-y: $kendo-grid-md-grouping-header-padding-y, + $kendo-grid-md-cell-padding-x: $kendo-grid-md-cell-padding-x, + $kendo-grid-md-cell-padding-y: $kendo-grid-md-cell-padding-y, + $kendo-grid-md-filter-cell-padding-x: $kendo-grid-md-filter-cell-padding-x, + $kendo-grid-md-filter-cell-padding-y: $kendo-grid-md-filter-cell-padding-y, + $kendo-grid-md-edit-cell-padding-x: $kendo-grid-md-edit-cell-padding-x, + $kendo-grid-md-edit-cell-padding-y: $kendo-grid-md-edit-cell-padding-y, + $kendo-grid-md-group-dropclue-height: $kendo-grid-md-group-dropclue-height, + $kendo-grid-md-selection-aggregates-padding-x: $kendo-grid-md-selection-aggregates-padding-x, + $kendo-grid-md-selection-aggregates-padding-y: $kendo-grid-md-selection-aggregates-padding-y, + $kendo-grid-sizes: $kendo-grid-sizes, + $kendo-grid-header-font-size: $kendo-grid-header-font-size, + $kendo-grid-header-first-border: $kendo-grid-header-first-border, + $kendo-grid-header-menu-icon-spacing: $kendo-grid-header-menu-icon-spacing, + $kendo-grid-filterable-icon-spacing: $kendo-grid-filterable-icon-spacing, + $kendo-grid-toolbar-border-width: $kendo-grid-toolbar-border-width, + $kendo-grid-cell-horizontal-border-width: $kendo-grid-cell-horizontal-border-width, + $kendo-grid-cell-vertical-border-width: $kendo-grid-cell-vertical-border-width, + $kendo-grid-bg: $kendo-grid-bg, + $kendo-grid-text: $kendo-grid-text, + $kendo-grid-border: $kendo-grid-border, + $kendo-grid-header-bg: $kendo-grid-header-bg, + $kendo-grid-header-text: $kendo-grid-header-text, + $kendo-grid-header-border: $kendo-grid-header-border, + $kendo-grid-header-gradient: $kendo-grid-header-gradient, + $kendo-grid-footer-bg: $kendo-grid-footer-bg, + $kendo-grid-footer-text: $kendo-grid-footer-text, + $kendo-grid-footer-border: $kendo-grid-footer-border, + $kendo-grid-alt-bg: $kendo-grid-alt-bg, + $kendo-grid-alt-text: $kendo-grid-alt-text, + $kendo-grid-alt-border: $kendo-grid-alt-border, + $kendo-grid-hover-bg: $kendo-grid-hover-bg, + $kendo-grid-hover-text: $kendo-grid-hover-text, + $kendo-grid-hover-border: $kendo-grid-hover-border, + $kendo-grid-selected-bg: $kendo-grid-selected-bg, + $kendo-grid-selected-text: $kendo-grid-selected-text, + $kendo-grid-selected-border: $kendo-grid-selected-border, + $kendo-grid-selection-aggregates-bg: $kendo-grid-selection-aggregates-bg, + $kendo-grid-selection-aggregates-text: $kendo-grid-selection-aggregates-text, + $kendo-grid-selection-aggregates-border: $kendo-grid-selection-aggregates-border, + $kendo-grid-selection-aggregates-border-width: $kendo-grid-selection-aggregates-border-width, + $kendo-grid-selection-aggregates-spacing: $kendo-grid-selection-aggregates-spacing, + $kendo-grid-selection-aggregates-line-height: $kendo-grid-selection-aggregates-line-height, + $kendo-grid-selection-aggregates-font-weight: $kendo-grid-selection-aggregates-font-weight, + $kendo-grid-grouping-row-bg: $kendo-grid-grouping-row-bg, + $kendo-grid-grouping-row-text: $kendo-grid-grouping-row-text, + $kendo-grid-sorted-bg: $kendo-grid-sorted-bg, + $kendo-grid-sorting-indicator-text: $kendo-grid-sorting-indicator-text, + $kendo-grid-sorting-index-font-size: $kendo-grid-sorting-index-font-size, + $kendo-grid-sorting-index-height: $kendo-grid-sorting-index-height, + $kendo-grid-sorting-index-spacing-y: $kendo-grid-sorting-index-spacing-y, + $kendo-grid-sorting-index-spacing-x: $kendo-grid-sorting-index-spacing-x, + $kendo-grid-sorted-icon-spacing: $kendo-grid-sorted-icon-spacing, + $kendo-grid-focus-shadow: $kendo-grid-focus-shadow, + $kendo-grid-command-cell-button-spacing: $kendo-grid-command-cell-button-spacing, + $kendo-grid-command-cell-padding-y: $kendo-grid-command-cell-padding-y, + $kendo-grid-sticky-bg: $kendo-grid-sticky-bg, + $kendo-grid-sticky-text: $kendo-grid-sticky-text, + $kendo-grid-sticky-border: $kendo-grid-sticky-border, + $kendo-grid-sticky-alt-bg: $kendo-grid-sticky-alt-bg, + $kendo-grid-sticky-header-bg: $kendo-grid-sticky-header-bg, + $kendo-grid-sticky-header-text: $kendo-grid-sticky-header-text, + $kendo-grid-sticky-header-border: $kendo-grid-sticky-header-border, + $kendo-grid-sticky-footer-bg: $kendo-grid-sticky-footer-bg, + $kendo-grid-sticky-footer-hover-bg: $kendo-grid-sticky-footer-hover-bg, + $kendo-grid-sticky-selected-bg: $kendo-grid-sticky-selected-bg, + $kendo-grid-sticky-selected-alt-bg: $kendo-grid-sticky-selected-alt-bg, + $kendo-grid-sticky-hover-bg: $kendo-grid-sticky-hover-bg, + $kendo-grid-sticky-selected-hover-bg: $kendo-grid-sticky-selected-hover-bg, + $kendo-grid-column-menu-width: $kendo-grid-column-menu-width, + $kendo-grid-column-menu-max-width: $kendo-grid-column-menu-max-width, + $kendo-grid-filter-menu-check-all-border-bottom-width: $kendo-grid-filter-menu-check-all-border-bottom-width, + $kendo-grid-filter-menu-item-spacing-x: $kendo-grid-filter-menu-item-spacing-x, + $kendo-grid-filter-menu-item-spacing-y: $kendo-grid-filter-menu-item-spacing-y, + $kendo-grid-column-menu-popup-padding-x: $kendo-grid-column-menu-popup-padding-x, + $kendo-grid-column-menu-popup-padding-y: $kendo-grid-column-menu-popup-padding-y, + $kendo-grid-column-menu-item-padding-x: $kendo-grid-column-menu-item-padding-x, + $kendo-grid-column-menu-item-padding-y: $kendo-grid-column-menu-item-padding-y, + $kendo-grid-column-menu-list-item-padding-x: $kendo-grid-column-menu-list-item-padding-x, + $kendo-grid-column-menu-list-item-padding-y: $kendo-grid-column-menu-list-item-padding-y, + $kendo-grid-column-menu-items-wrap-padding-x: $kendo-grid-column-menu-items-wrap-padding-x, + $kendo-grid-column-menu-items-wrap-padding-y: $kendo-grid-column-menu-items-wrap-padding-y, + $kendo-grid-column-menu-group-header-padding-x: $kendo-grid-column-menu-group-header-padding-x, + $kendo-grid-column-menu-group-header-padding-y: $kendo-grid-column-menu-group-header-padding-y, + $kendo-grid-column-menu-group-header-font-size: $kendo-grid-column-menu-group-header-font-size, + $kendo-grid-column-menu-group-header-line-height: $kendo-grid-column-menu-group-header-line-height, + $kendo-grid-column-menu-group-header-text-transform: $kendo-grid-column-menu-group-header-text-transform, + $kendo-grid-column-menu-group-header-border-bottom-width: $kendo-grid-column-menu-group-header-border-bottom-width, + $kendo-grid-column-menu-group-header-bg: $kendo-grid-column-menu-group-header-bg, + $kendo-grid-column-menu-group-header-text: $kendo-grid-column-menu-group-header-text, + $kendo-grid-column-menu-group-header-border: $kendo-grid-column-menu-group-header-border, + $kendo-grid-column-menu-tabbed-tabstrip-content-padding-x: $kendo-grid-column-menu-tabbed-tabstrip-content-padding-x, + $kendo-grid-column-menu-tabbed-tabstrip-content-padding-y: $kendo-grid-column-menu-tabbed-tabstrip-content-padding-y, + $kendo-grid-column-menu-tabbed-bg: $kendo-grid-column-menu-tabbed-bg, + $kendo-grid-drag-cell-width: $kendo-grid-drag-cell-width, + $kendo-grid-row-inner-height: $kendo-grid-row-inner-height, + $kendo-grid-hierarchy-col-width: $kendo-grid-hierarchy-col-width, + $kendo-grid-grouping-row-border-top: $kendo-grid-grouping-row-border-top, + $kendo-grid-group-footer-border-y: $kendo-grid-group-footer-border-y, + $kendo-grid-group-footer-second-cell-border: $kendo-grid-group-footer-second-cell-border, + $kendo-grid-row-resizer-hover-bg: $kendo-grid-row-resizer-hover-bg, + $kendo-grid-row-resizer-active-bg: $kendo-grid-row-resizer-active-bg, + $kendo-grid-row-resizer-height: $kendo-grid-row-resizer-height +); diff --git a/packages/bootstrap/scss/icon/_layout.scss b/packages/bootstrap/scss/icon/_layout.scss index e8ad6e4c6a6..fef6ab09558 100644 --- a/packages/bootstrap/scss/icon/_layout.scss +++ b/packages/bootstrap/scss/icon/_layout.scss @@ -1,4 +1,4 @@ -// @import "@progress/kendo-theme-default/scss/icons/_layout.scss"; +// @use "@progress/kendo-theme-default/scss/icons/_layout.scss" as *; @use "./_variables.scss" as *; diff --git a/packages/bootstrap/scss/icon/_theme.scss b/packages/bootstrap/scss/icon/_theme.scss index c7add268865..70cec1dcac6 100644 --- a/packages/bootstrap/scss/icon/_theme.scss +++ b/packages/bootstrap/scss/icon/_theme.scss @@ -1,4 +1,4 @@ -// @import "@progress/kendo-theme-default/scss/icons/_theme.scss"; +// @use "@progress/kendo-theme-default/scss/icons/_theme.scss" as *; @mixin kendo-icon--theme() { diff --git a/packages/bootstrap/scss/icon/_variables.scss b/packages/bootstrap/scss/icon/_variables.scss index 4dc8632d815..e80c203b5f6 100644 --- a/packages/bootstrap/scss/icon/_variables.scss +++ b/packages/bootstrap/scss/icon/_variables.scss @@ -21,7 +21,7 @@ $kendo-icon-spacing: k-spacing(1) !default; /// @group icon $kendo-icon-padding: k-spacing(1) !default; -:root { +/* :root { --kendo-icon-size: var( --kendo-icon-size, 1rem ); --kendo-icon-size-xs: #{$kendo-icon-size-xs}; --kendo-icon-size-sm: #{$kendo-icon-size-sm}; @@ -32,4 +32,18 @@ $kendo-icon-padding: k-spacing(1) !default; --kendo-icon-size-xxxl: #{$kendo-icon-size-xxxl}; --kendo-icon-spacing: #{$kendo-icon-spacing}; --kendo-icon-padding: #{$kendo-icon-padding}; -} +} */ + + +/* @forward "@progress/kendo-theme-default/scss/icon/_variables.scss" with ( + $kendo-icon-size: $kendo-icon-size, + $kendo-icon-size-xs: $kendo-icon-size-xs, + $kendo-icon-size-sm: $kendo-icon-size-sm, + $kendo-icon-size-md: $kendo-icon-size-md, + $kendo-icon-size-lg: $kendo-icon-size-lg, + $kendo-icon-size-xl: $kendo-icon-size-xl, + $kendo-icon-size-xxl: $kendo-icon-size-xxl, + $kendo-icon-size-xxxl: $kendo-icon-size-xxxl, + // $kendo-icon-spacing: $kendo-icon-spacing, + // $kendo-icon-padding: $kendo-icon-padding +); */ diff --git a/packages/bootstrap/scss/icons/_index.scss b/packages/bootstrap/scss/icons/_index.scss index 07eac8264a5..5dfc6f7b009 100644 --- a/packages/bootstrap/scss/icons/_index.scss +++ b/packages/bootstrap/scss/icons/_index.scss @@ -4,6 +4,7 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; diff --git a/packages/bootstrap/scss/icons/_variables.scss b/packages/bootstrap/scss/icons/_variables.scss index 4dc8632d815..f4aa3e2b2f0 100644 --- a/packages/bootstrap/scss/icons/_variables.scss +++ b/packages/bootstrap/scss/icons/_variables.scss @@ -1,5 +1,5 @@ -@use "sass:map"; -@use "../core/_index.scss" as *; +// @use "sass:map"; +// @use "../core/_index.scss" as *; /// Font sizes of the icons. /// @group icon @@ -21,7 +21,7 @@ $kendo-icon-spacing: k-spacing(1) !default; /// @group icon $kendo-icon-padding: k-spacing(1) !default; -:root { +/* :root { --kendo-icon-size: var( --kendo-icon-size, 1rem ); --kendo-icon-size-xs: #{$kendo-icon-size-xs}; --kendo-icon-size-sm: #{$kendo-icon-size-sm}; @@ -32,4 +32,18 @@ $kendo-icon-padding: k-spacing(1) !default; --kendo-icon-size-xxxl: #{$kendo-icon-size-xxxl}; --kendo-icon-spacing: #{$kendo-icon-spacing}; --kendo-icon-padding: #{$kendo-icon-padding}; -} +} */ + + +@forward "@progress/kendo-theme-default/scss/icons/_variables.scss" with ( + $kendo-icon-size: $kendo-icon-size, + $kendo-icon-size-xs: $kendo-icon-size-xs, + $kendo-icon-size-sm: $kendo-icon-size-sm, + $kendo-icon-size-md: $kendo-icon-size-md, + $kendo-icon-size-lg: $kendo-icon-size-lg, + $kendo-icon-size-xl: $kendo-icon-size-xl, + $kendo-icon-size-xxl: $kendo-icon-size-xxl, + $kendo-icon-size-xxxl: $kendo-icon-size-xxxl, + // $kendo-icon-spacing: $kendo-icon-spacing, + // $kendo-icon-padding: $kendo-icon-padding +); diff --git a/packages/bootstrap/scss/imageeditor/_index.scss b/packages/bootstrap/scss/imageeditor/_index.scss index 921ac865772..9554ac5264c 100644 --- a/packages/bootstrap/scss/imageeditor/_index.scss +++ b/packages/bootstrap/scss/imageeditor/_index.scss @@ -14,8 +14,14 @@ // Expose -@mixin imageeditor-styles() { - @include import-once( "imageeditor" ) { +@mixin kendo-image-editor--styles() { + @include import-once( "image-editor" ) { + @include core-styles(); + @include kendo-toolbar--styles(); + @include kendo-form--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-numeric-textbox--styles(); + @include kendo-checkbox--styles(); @include kendo-image-editor--layout(); @include kendo-image-editor--theme(); } diff --git a/packages/bootstrap/scss/imageeditor/_layout.scss b/packages/bootstrap/scss/imageeditor/_layout.scss index 1b868706d99..736e71b707f 100644 --- a/packages/bootstrap/scss/imageeditor/_layout.scss +++ b/packages/bootstrap/scss/imageeditor/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../toolbar/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/imageeditor/_layout.scss"; +@use "@progress/kendo-theme-default/scss/imageeditor/_layout.scss" as *; @mixin kendo-image-editor--layout() { diff --git a/packages/bootstrap/scss/imageeditor/_theme.scss b/packages/bootstrap/scss/imageeditor/_theme.scss index 8a2b6d6096c..7ef14b84060 100644 --- a/packages/bootstrap/scss/imageeditor/_theme.scss +++ b/packages/bootstrap/scss/imageeditor/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/imageeditor/_theme.scss"; +@use "@progress/kendo-theme-default/scss/imageeditor/_theme.scss" as *; @mixin kendo-image-editor--theme() { diff --git a/packages/bootstrap/scss/imageeditor/_variables.scss b/packages/bootstrap/scss/imageeditor/_variables.scss index df4c9956825..c53335bdbcc 100644 --- a/packages/bootstrap/scss/imageeditor/_variables.scss +++ b/packages/bootstrap/scss/imageeditor/_variables.scss @@ -43,3 +43,38 @@ $kendo-image-editor-crop-text: null !default; $kendo-image-editor-crop-border: white !default; $kendo-image-editor-crop-overlay-bg: rgba( black, .3 ) !default; + + +@forward "@progress/kendo-theme-default/scss/imageeditor/_variables.scss" with ( + $kendo-image-editor-margin-y: $kendo-image-editor-margin-y, + $kendo-image-editor-margin-x: $kendo-image-editor-margin-x, + $kendo-image-editor-padding-y: $kendo-image-editor-padding-y, + $kendo-image-editor-padding-x: $kendo-image-editor-padding-x, + $kendo-image-editor-border-width: $kendo-image-editor-border-width, + $kendo-image-editor-font-size: $kendo-image-editor-font-size, + $kendo-image-editor-line-height: $kendo-image-editor-line-height, + $kendo-image-editor-font-family: $kendo-image-editor-font-family, + $kendo-image-editor-content-border-width: $kendo-image-editor-content-border-width, + $kendo-image-editor-action-pane-padding-y: $kendo-image-editor-action-pane-padding-y, + $kendo-image-editor-action-pane-padding-x: $kendo-image-editor-action-pane-padding-x, + $kendo-image-editor-action-pane-width: $kendo-image-editor-action-pane-width, + $kendo-image-editor-crop-border-width: $kendo-image-editor-crop-border-width, + $kendo-image-editor-crop-border-style: $kendo-image-editor-crop-border-style, + $kendo-image-editor-resize-handle-margin-x: $kendo-image-editor-resize-handle-margin-x, + $kendo-image-editor-resize-handle-margin-y: $kendo-image-editor-resize-handle-margin-y, + $kendo-image-editor-resize-handle-border-width: $kendo-image-editor-resize-handle-border-width, + $kendo-image-editor-resize-handle-size: $kendo-image-editor-resize-handle-size, + $kendo-image-editor-bg: $kendo-image-editor-bg, + $kendo-image-editor-text: $kendo-image-editor-text, + $kendo-image-editor-border: $kendo-image-editor-border, + $kendo-image-editor-content-bg: $kendo-image-editor-content-bg, + $kendo-image-editor-content-text: $kendo-image-editor-content-text, + $kendo-image-editor-content-border: $kendo-image-editor-content-border, + $kendo-image-editor-action-pane-bg: $kendo-image-editor-action-pane-bg, + $kendo-image-editor-action-pane-text: $kendo-image-editor-action-pane-text, + $kendo-image-editor-action-pane-border: $kendo-image-editor-action-pane-border, + $kendo-image-editor-crop-bg: $kendo-image-editor-crop-bg, + $kendo-image-editor-crop-text: $kendo-image-editor-crop-text, + $kendo-image-editor-crop-border: $kendo-image-editor-crop-border, + $kendo-image-editor-crop-overlay-bg: $kendo-image-editor-crop-overlay-bg +); diff --git a/packages/bootstrap/scss/index.scss b/packages/bootstrap/scss/index.scss index 28963cec16a..d6e0f2ad318 100644 --- a/packages/bootstrap/scss/index.scss +++ b/packages/bootstrap/scss/index.scss @@ -2,359 +2,334 @@ // Typography -// @forward "./typography/_index.scss"; +@forward "./typography/_index.scss"; // Generic content @forward "./icons/_index.scss"; -// @forward "./messagebox/_index.scss"; +@forward "./messagebox/_index.scss"; // Primitive components -// @forward "./draggable/_index.scss"; -// @forward "./list/_index.scss"; -// @forward "./listgroup/_index.scss"; -// @forward "./overlay/_index.scss"; -// @forward "./popup/_index.scss"; -// @forward "./ripple/_index.scss"; -// @forward "./table/_index.scss"; -// @forward "./virtual-scroller/_index.scss"; - +@forward "./draggable/_index.scss"; +@forward "./list/_index.scss"; +@forward "./listgroup/_index.scss"; +@forward "./overlay/_index.scss"; +@forward "./popup/_index.scss"; +@forward "./ripple/_index.scss"; +@forward "./table/_index.scss"; +@forward "./virtual-scroller/_index.scss"; // Indicators -// @forward "./avatar/_index.scss"; +@forward "./avatar/_index.scss"; @forward "./badge/_index.scss"; -// @forward "./chip/_index.scss"; -// @forward "./color-preview/_index.scss"; -// @forward "./loader/_index.scss"; +@forward "./chip/_index.scss"; +@forward "./color-preview/_index.scss"; +@forward "./loader/_index.scss"; // @use "./loading/_index.scss"; -// @forward "./skeleton/_index.scss"; -// @forward "./time-marker/_index.scss"; +@forward "./skeleton/_index.scss"; +@forward "./time-marker/_index.scss"; // Form helpers -// @forward "./forms/_index.scss"; -// @forward "./validator/_index.scss"; -// @forward "./floating-label/_index.scss"; +@forward "./forms/_index.scss"; +@forward "./validator/_index.scss"; +@forward "./floating-label/_index.scss"; // Native forms - @forward "./button/_index.scss"; - -// @forward "./split-button/_index.scss"; -// @forward "./menu-button/_index.scss"; -// @forward "./input/_index.scss"; -// @forward "./textbox/_index.scss"; -// @forward "./textarea/_index.scss"; -// @forward "./checkbox/_index.scss"; -// @forward "./listbox/_index.scss"; -// @forward "./progressbar/_index.scss"; -// @forward "./radio/_index.scss"; -// @forward "./slider/_index.scss"; +@forward "./button/_index.scss"; +@forward "./split-button/_index.scss"; +@forward "./menu-button/_index.scss"; +@forward "./input/_index.scss"; +@forward "./textbox/_index.scss"; +@forward "./textarea/_index.scss"; +@forward "./checkbox/_index.scss"; +@forward "./listbox/_index.scss"; +@forward "./progressbar/_index.scss"; +@forward "./radio/_index.scss"; +@forward "./slider/_index.scss"; // Form requirements -// @forward "./calendar/_index.scss"; -// @forward "./timeselector/_index.scss"; +@forward "./calendar/_index.scss"; +@forward "./timeselector/_index.scss"; // Augmented forms -// @forward "./autocomplete/_index.scss"; -// @forward "./captcha/_index.scss"; -// @forward "./colorpalette/_index.scss"; -// @forward "./colorgradient/_index.scss"; -// @forward "./coloreditor/_index.scss"; -// @forward "./colorpicker/_index.scss"; -// @forward "./combobox/_index.scss"; -// @forward "./dateinput/_index.scss"; -// @forward "./datepicker/_index.scss"; -// @forward "./timepicker/_index.scss"; -// @forward "./datetimepicker/_index.scss"; -// @forward "./timedurationpicker/_index.scss"; -// @forward "./daterangepicker/_index.scss"; -// @forward "./dropdowngrid/_index.scss"; -// @forward "./dropdownlist/_index.scss"; -// @forward "./dropdowntree/_index.scss"; -// @forward "./maskedtextbox/_index.scss"; -// @forward "./multiselect/_index.scss"; -// @forward "./numerictextbox/_index.scss"; -// @forward "./rating/_index.scss"; -// @forward "./searchbox/_index.scss"; -// @forward "./switch/_index.scss"; -// @forward "./upload/_index.scss"; -// @forward "./dropzone/_index.scss"; +@forward "./autocomplete/_index.scss"; +@forward "./captcha/_index.scss"; +@forward "./colorpalette/_index.scss"; +@forward "./colorgradient/_index.scss"; +@forward "./coloreditor/_index.scss"; +@forward "./colorpicker/_index.scss"; +@forward "./combobox/_index.scss"; +@forward "./dateinput/_index.scss"; +@forward "./datepicker/_index.scss"; +@forward "./timepicker/_index.scss"; +@forward "./datetimepicker/_index.scss"; +@forward "./timedurationpicker/_index.scss"; +@forward "./daterangepicker/_index.scss"; +@forward "./dropdowngrid/_index.scss"; +@forward "./dropdownlist/_index.scss"; +@forward "./dropdowntree/_index.scss"; +@forward "./maskedtextbox/_index.scss"; +@forward "./multiselect/_index.scss"; +@forward "./numerictextbox/_index.scss"; +@forward "./rating/_index.scss"; +@forward "./searchbox/_index.scss"; +@forward "./switch/_index.scss"; +@forward "./upload/_index.scss"; +@forward "./dropzone/_index.scss"; // Command interfaces -// @forward "./action-buttons/_index.scss"; -// @forward "./appbar/_index.scss"; -// @forward "./fab/_index.scss"; -// @forward "./menu/_index.scss"; -// @forward "./toolbar/_index.scss"; - +@forward "./action-buttons/_index.scss"; +@forward "./appbar/_index.scss"; +@forward "./fab/_index.scss"; +@forward "./menu/_index.scss"; +@forward "./toolbar/_index.scss"; // Popups and modals -// @forward "./action-sheet/_index.scss"; -// @forward "./dialog/_index.scss"; -// @forward "./drawer/_index.scss"; -// @forward "./notification/_index.scss"; -// @forward "./popover/_index.scss"; -// @forward "./responsivepanel/_index.scss"; -// @forward "./tooltip/_index.scss"; -// @forward "./window/_index.scss"; - +@forward "./action-sheet/_index.scss"; +@forward "./dialog/_index.scss"; +@forward "./drawer/_index.scss"; +@forward "./notification/_index.scss"; +@forward "./popover/_index.scss"; +@forward "./responsivepanel/_index.scss"; +@forward "./tooltip/_index.scss"; +@forward "./window/_index.scss"; // Navigation -// @forward "./bottom-navigation/_index.scss"; -// @forward "./breadcrumb/_index.scss"; -// @forward "./pager/_index.scss"; -// @forward "./stepper/_index.scss"; -// @forward "./tabstrip/_index.scss"; -// @forward "./treeview/_index.scss"; -// @forward "./wizard/_index.scss"; +@forward "./bottom-navigation/_index.scss"; +@forward "./breadcrumb/_index.scss"; +@forward "./pager/_index.scss"; +@forward "./stepper/_index.scss"; +@forward "./tabstrip/_index.scss"; +@forward "./treeview/_index.scss"; +@forward "./wizard/_index.scss"; // Layout & containers -// @forward "./card/_index.scss"; -// @forward "./expansion-panel/_index.scss"; -// @forward "./panel/_index.scss"; -// @forward "./panelbar/_index.scss"; -// @forward "./splitter/_index.scss"; -// @forward "./tilelayout/_index.scss"; -// @forward "./dock-manager/_index.scss"; -// @forward "./chart-wizard/_index.scss"; - +@forward "./card/_index.scss"; +@forward "./expansion-panel/_index.scss"; +@forward "./panel/_index.scss"; +@forward "./panelbar/_index.scss"; +@forward "./splitter/_index.scss"; +@forward "./tilelayout/_index.scss"; +@forward "./dock-manager/_index.scss"; +@forward "./chart-wizard/_index.scss"; // Data management -// @forward "./grid/_index.scss"; -// @forward "./listview/_index.scss"; -// @forward "./spreadsheet/_index.scss"; -// @forward "./pivotgrid/_index.scss"; -// @forward "./treelist/_index.scss"; -// @forward "./filter/_index.scss"; -// @forward "./filemanager/_index.scss"; -// @forward "./taskboard/_index.scss"; - +@forward "./grid/_index.scss"; +@forward "./listview/_index.scss"; +@forward "./spreadsheet/_index.scss"; +@forward "./pivotgrid/_index.scss"; +@forward "./treelist/_index.scss"; +@forward "./filter/_index.scss"; +@forward "./filemanager/_index.scss"; +@forward "./taskboard/_index.scss"; // Editors - -// @forward "./editor/_index.scss"; -// @forward "./imageeditor/_index.scss"; +@forward "./editor/_index.scss"; +@forward "./imageeditor/_index.scss"; // Scheduling - -// @forward "./gantt/_index.scss"; -// @forward "./scheduler/_index.scss"; +@forward "./gantt/_index.scss"; +@forward "./scheduler/_index.scss"; // Misc -// @forward "./adaptive/_index.scss"; -// @forward "./chat/_index.scss"; -// @forward "./mediaplayer/_index.scss"; -// @forward "./timeline/_index.scss"; -// @forward "./pdf-viewer/_index.scss"; -// @forward "./scroller/_index.scss"; -// @forward "./scrollview/_index.scss"; -// @forward "./prompt/_index.scss"; +@forward "./adaptive/_index.scss"; +@forward "./chat/_index.scss"; +@forward "./mediaplayer/_index.scss"; +@forward "./timeline/_index.scss"; +@forward "./pdf-viewer/_index.scss"; +@forward "./scroller/_index.scss"; +@forward "./scrollview/_index.scss"; +@forward "./prompt/_index.scss"; // Dataviz -// @forward "./dataviz/_index.scss"; -// @forward "./map/_index.scss"; -// @forward "./orgchart/_index.scss"; -// @forward "./signature/_index.scss"; +@forward "./dataviz/_index.scss"; +@forward "./map/_index.scss"; +@forward "./orgchart/_index.scss"; +@forward "./signature/_index.scss"; @use "./core/_index.scss" as *; // Typography -// @use "./typography/_index.scss"; +@use "./typography/_index.scss" as *; // Generic content @use "./icons/_index.scss" as *; -// @use "./messagebox/_index.scss"; +@use "./messagebox/_index.scss" as *; // Primitive components -// @use "./draggable/_index.scss"; -// @use "./list/_index.scss"; -// @use "./listgroup/_index.scss"; -// @use "./overlay/_index.scss"; -// @use "./popup/_index.scss"; -// @use "./ripple/_index.scss"; -// @use "./table/_index.scss"; -// @use "./virtual-scroller/_index.scss"; - +@use "./draggable/_index.scss" as *; +@use "./list/_index.scss" as *; +@use "./listgroup/_index.scss" as *; +@use "./overlay/_index.scss" as *; +@use "./popup/_index.scss" as *; +@use "./ripple/_index.scss" as *; +@use "./table/_index.scss" as *; +@use "./virtual-scroller/_index.scss" as *; // Indicators -// @use "./avatar/_index.scss"; +@use "./avatar/_index.scss" as *; @use "./badge/_index.scss" as *; -// @use "./chip/_index.scss"; -// @use "./color-preview/_index.scss"; -// @use "./loader/_index.scss"; -// @use "./loading/_index.scss"; - -// @use "./skeleton/_index.scss"; -// @use "./time-marker/_index.scss"; - +@use "./chip/_index.scss" as *; +@use "./color-preview/_index.scss" as *; +@use "./loader/_index.scss" as *; +// @use "./loading/_index.scss" as *; +@use "./skeleton/_index.scss" as *; +@use "./time-marker/_index.scss" as *; // Form helpers -// @use "./forms/_index.scss"; -// @use "./validator/_index.scss"; -// @use "./floating-label/_index.scss"; - +@use "./forms/_index.scss" as *; +@use "./validator/_index.scss" as *; +@use "./floating-label/_index.scss" as *; // Native forms @use "./button/_index.scss" as *; -// @use "./split-button/_index.scss"; -// @use "./menu-button/_index.scss"; -// @use "./input/_index.scss"; -// @use "./textbox/_index.scss"; -// @use "./textarea/_index.scss"; -// @use "./checkbox/_index.scss"; -// @use "./listbox/_index.scss"; -// @use "./progressbar/_index.scss"; -// @use "./radio/_index.scss"; -// @use "./slider/_index.scss"; - +@use "./split-button/_index.scss" as *; +@use "./menu-button/_index.scss" as *; +@use "./input/_index.scss" as *; +@use "./textbox/_index.scss" as *; +@use "./textarea/_index.scss" as *; +@use "./checkbox/_index.scss" as *; +@use "./listbox/_index.scss" as *; +@use "./progressbar/_index.scss" as *; +@use "./radio/_index.scss" as *; +@use "./slider/_index.scss" as *; // Form requirements -// @use "./calendar/_index.scss"; -// @use "./timeselector/_index.scss"; +@use "./calendar/_index.scss" as *; +@use "./timeselector/_index.scss" as *; // Augmented forms -// @use "./autocomplete/_index.scss"; -// @use "./captcha/_index.scss"; -// @use "./colorpalette/_index.scss"; -// @use "./colorgradient/_index.scss"; -// @use "./coloreditor/_index.scss"; -// @use "./colorpicker/_index.scss"; -// @use "./combobox/_index.scss"; -// @use "./dateinput/_index.scss"; -// @use "./datepicker/_index.scss"; -// @use "./timepicker/_index.scss"; -// @use "./datetimepicker/_index.scss"; -// @use "./timedurationpicker/_index.scss"; -// @use "./daterangepicker/_index.scss"; -// @use "./dropdowngrid/_index.scss"; -// @use "./dropdownlist/_index.scss"; -// @use "./dropdowntree/_index.scss"; -// @use "./maskedtextbox/_index.scss"; -// @use "./multiselect/_index.scss"; -// @use "./numerictextbox/_index.scss"; -// @use "./rating/_index.scss"; -// @use "./searchbox/_index.scss"; -// @use "./switch/_index.scss"; -// @use "./upload/_index.scss"; -// @use "./dropzone/_index.scss"; - - +@use "./autocomplete/_index.scss" as *; +@use "./captcha/_index.scss" as *; +@use "./colorpalette/_index.scss" as *; +@use "./colorgradient/_index.scss" as *; +@use "./coloreditor/_index.scss" as *; +@use "./colorpicker/_index.scss" as *; +@use "./combobox/_index.scss" as *; +@use "./dateinput/_index.scss" as *; +@use "./datepicker/_index.scss" as *; +@use "./timepicker/_index.scss" as *; +@use "./datetimepicker/_index.scss" as *; +@use "./timedurationpicker/_index.scss" as *; +@use "./daterangepicker/_index.scss" as *; +@use "./dropdowngrid/_index.scss" as *; +@use "./dropdownlist/_index.scss" as *; +@use "./dropdowntree/_index.scss" as *; +@use "./maskedtextbox/_index.scss" as *; +@use "./multiselect/_index.scss" as *; +@use "./numerictextbox/_index.scss" as *; +@use "./rating/_index.scss" as *; +@use "./searchbox/_index.scss" as *; +@use "./switch/_index.scss" as *; +@use "./upload/_index.scss" as *; +@use "./dropzone/_index.scss" as *; // Command interfaces -// @use "./action-buttons/_index.scss"; -// @use "./appbar/_index.scss"; -// @use "./fab/_index.scss"; -// @use "./menu/_index.scss"; -// @use "./toolbar/_index.scss"; - - +@use "./action-buttons/_index.scss" as *; +@use "./appbar/_index.scss" as *; +@use "./fab/_index.scss" as *; +@use "./menu/_index.scss" as *; +@use "./toolbar/_index.scss" as *; // Popups and modals -// @use "./action-sheet/_index.scss"; -// @use "./dialog/_index.scss"; -// @use "./drawer/_index.scss"; -// @use "./notification/_index.scss"; -// @use "./popover/_index.scss"; -// @use "./responsivepanel/_index.scss"; -// @use "./tooltip/_index.scss"; -// @use "./window/_index.scss"; - +@use "./action-sheet/_index.scss" as *; +@use "./dialog/_index.scss" as *; +@use "./drawer/_index.scss" as *; +@use "./notification/_index.scss" as *; +@use "./popover/_index.scss" as *; +@use "./responsivepanel/_index.scss" as *; +@use "./tooltip/_index.scss" as *; +@use "./window/_index.scss" as *; // Navigation -// @use "./bottom-navigation/_index.scss"; -// @use "./breadcrumb/_index.scss"; -// @use "./pager/_index.scss"; -// @use "./stepper/_index.scss"; -// @use "./tabstrip/_index.scss"; -// @use "./treeview/_index.scss"; -// @use "./wizard/_index.scss"; - +@use "./bottom-navigation/_index.scss" as *; +@use "./breadcrumb/_index.scss" as *; +@use "./pager/_index.scss" as *; +@use "./stepper/_index.scss" as *; +@use "./tabstrip/_index.scss" as *; +@use "./treeview/_index.scss" as *; +@use "./wizard/_index.scss" as *; // Layout & containers -// @use "./card/_index.scss"; -// @use "./expansion-panel/_index.scss"; -// @use "./panel/_index.scss"; -// @use "./panelbar/_index.scss"; -// @use "./splitter/_index.scss"; -// @use "./tilelayout/_index.scss"; -// @use "./dock-manager/_index.scss"; -// @use "./chart-wizard/_index.scss"; - +@use "./card/_index.scss" as *; +@use "./expansion-panel/_index.scss" as *; +@use "./panel/_index.scss" as *; +@use "./panelbar/_index.scss" as *; +@use "./splitter/_index.scss" as *; +@use "./tilelayout/_index.scss" as *; +@use "./dock-manager/_index.scss" as *; +@use "./chart-wizard/_index.scss" as *; // Data management -// @use "./grid/_index.scss"; -// @use "./listview/_index.scss"; -// @use "./spreadsheet/_index.scss"; -// @use "./pivotgrid/_index.scss"; -// @use "./treelist/_index.scss"; -// @use "./filter/_index.scss"; -// @use "./filemanager/_index.scss"; -// @use "./taskboard/_index.scss"; - +@use "./grid/_index.scss" as *; +@use "./listview/_index.scss" as *; +@use "./spreadsheet/_index.scss" as *; +@use "./pivotgrid/_index.scss" as *; +@use "./treelist/_index.scss" as *; +@use "./filter/_index.scss" as *; +@use "./filemanager/_index.scss" as *; +@use "./taskboard/_index.scss" as *; // Editors -// @use "./editor/_index.scss"; -// @use "./imageeditor/_index.scss"; - +@use "./editor/_index.scss" as *; +@use "./imageeditor/_index.scss" as *; // Scheduling -// @use "./gantt/_index.scss"; -// @use "./scheduler/_index.scss"; - +@use "./gantt/_index.scss" as *; +@use "./scheduler/_index.scss" as *; // Misc -// @use "./adaptive/_index.scss"; -// @use "./chat/_index.scss"; -// @use "./mediaplayer/_index.scss"; -// @use "./timeline/_index.scss"; -// @use "./pdf-viewer/_index.scss"; -// @use "./scroller/_index.scss"; -// @use "./scrollview/_index.scss"; -// @use "./prompt/_index.scss"; - +@use "./adaptive/_index.scss" as *; +@use "./chat/_index.scss" as *; +@use "./mediaplayer/_index.scss" as *; +@use "./timeline/_index.scss" as *; +@use "./pdf-viewer/_index.scss" as *; +@use "./scroller/_index.scss" as *; +@use "./scrollview/_index.scss" as *; +@use "./prompt/_index.scss" as *; // Dataviz -// @use "./dataviz/_index.scss"; -// @use "./map/_index.scss"; -// @use "./orgchart/_index.scss"; -// @use "./signature/_index.scss"; - +@use "./dataviz/_index.scss" as *; +@use "./map/_index.scss" as *; +@use "./orgchart/_index.scss" as *; +@use "./signature/_index.scss" as *; // Configuration // @mixin kendo-theme--config( $config: null ) { @@ -369,164 +344,164 @@ // Color system // Typography - // @include typography--styles(); + @include typography--styles(); // Generic content @include kendo-icon--styles(); - // @include messagebox--styles(); + @include kendo-messagebox--styles(); // Primitive components - // @include action-buttons--styles(); - // @include list--styles(); - // @include listgroup--styles(); - // @include overlay--styles(); - // @include popup--styles(); - // @include ripple--styles(); - // @include table--styles(); - // @include virtual-scroller--styles(); + @include kendo-action-buttons--styles(); + @include kendo-list--styles(); + @include kendo-listgroup--styles(); + @include kendo-overlay--styles(); + @include kendo-popup--styles(); + @include kendo-ripple--styles(); + @include kendo-table--styles(); + @include kendo-virtual-scroller--styles(); // Indicators - // @include avatar--styles(); + @include kendo-avatar--styles(); @include kendo-badge--styles(); - // @include chip--styles(); - // @include color-preview--styles(); - // @include loader--styles(); - // @include skeleton--styles(); - // @include tooltip--styles(); - // @include time-marker--styles(); + @include kendo-chip--styles(); + @include kendo-color-preview--styles(); + @include kendo-loader--styles(); + @include kendo-skeleton--styles(); + @include kendo-tooltip--styles(); + @include kendo-time-marker--styles(); // Form helpers - // @include form--styles(); - // @include validator--styles(); - // @include floating-label--styles(); + @include kendo-form--styles(); + @include kendo-validator--styles(); + @include kendo-floating-label--styles(); // Native forms @include kendo-button--styles(); - // @include split-button--styles(); - // @include menu-button--styles(); - // @include input--styles(); - // @include textbox--styles(); - // @include textarea--styles(); - // @include checkbox--styles(); - // @include listbox--styles(); - // @include progressbar--styles(); - // @include radio--styles(); - // @include slider--styles(); + @include kendo-split-button--styles(); + @include kendo-menu-button--styles(); + @include kendo-input--styles(); + @include kendo-textbox--styles(); + @include kendo-textarea--styles(); + @include kendo-checkbox--styles(); + @include kendo-listbox--styles(); + @include kendo-progressbar--styles(); + @include kendo-radio--styles(); + @include kendo-slider--styles(); // Form requirements - // @include calendar--styles(); - // @include time-selector--styles(); + @include kendo-calendar--styles(); + @include kendo-time-selector--styles(); // Augmented forms - // @include autocomplete--styles(); - // @include captcha--styles(); - // @include color-palette--styles(); - // @include color-gradient--styles(); - // @include color-editor--styles(); - // @include color-picker--styles(); - // @include combobox--styles(); - // @include date-input--styles(); - // @include date-picker--styles(); - // @include time-picker--styles(); - // @include time-duration-picker--styles(); - // @include date-time-picker--styles(); - // @include date-range-picker--styles(); - // @include dropdown-grid--styles(); - // @include dropdown-list--styles(); - // @include dropdown-tree--styles(); - // @include masked-textbox--styles(); - // @include multiselect--styles(); - // @include numeric-textbox--styles(); - // @include rating--styles(); - // @include searchbox--styles(); - // @include switch--styles(); - // @include upload--styles(); - // @include dropzone--styles(); + @include kendo-autocomplete--styles(); + @include kendo-captcha--styles(); + @include kendo-color-palette--styles(); + @include kendo-color-gradient--styles(); + @include kendo-color-editor--styles(); + @include kendo-color-picker--styles(); + @include kendo-combobox--styles(); + @include kendo-date-input--styles(); + @include kendo-date-picker--styles(); + @include kendo-time-picker--styles(); + @include kendo-time-duration-picker--styles(); + @include kendo-date-time-picker--styles(); + @include kendo-date-range-picker--styles(); + @include kendo-dropdown-grid--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-dropdown-tree--styles(); + @include kendo-masked-textbox--styles(); + @include kendo-multiselect--styles(); + @include kendo-numeric-textbox--styles(); + @include kendo-rating--styles(); + @include kendo-searchbox--styles(); + @include kendo-switch--styles(); + @include kendo-upload--styles(); + @include kendo-dropzone--styles(); // Command interfaces - // @include appbar--styles(); - // @include fab--styles(); - // @include menu--styles(); - // @include toolbar--styles(); + @include kendo-appbar--styles(); + @include kendo-fab--styles(); + @include kendo-menu--styles(); + @include kendo-toolbar--styles(); // Popups and modals - // @include window--styles(); - // @include action-sheet--styles(); - // @include dialog--styles(); - // @include drawer--styles(); - // @include notification--styles(); - // @include popover--styles(); - // @include responsive-panel--styles(); + @include kendo-window--styles(); + @include kendo-action-sheet--styles(); + @include kendo-dialog--styles(); + @include kendo-drawer--styles(); + @include kendo-notification--styles(); + @include kendo-popover--styles(); + @include kendo-responsive-panel--styles(); // Navigation - // @include bottom-navigation--styles(); - // @include breadcrumb--styles(); - // @include pager--styles(); - // @include stepper--styles(); - // @include tabstrip--styles(); - // @include treeview--styles(); - // @include wizard--styles(); + @include kendo-bottom-navigation--styles(); + @include kendo-breadcrumb--styles(); + @include kendo-pager--styles(); + @include kendo-stepper--styles(); + @include kendo-tabstrip--styles(); + @include kendo-treeview--styles(); + @include kendo-wizard--styles(); // Layout & containers - // @include card--styles(); - // @include expander--styles(); - // @include panelbar--styles(); - // @include splitter--styles(); - // @include tile-layout--styles(); - // @include dock-manager--styles(); - // @include chart-wizard--styles(); + @include kendo-card--styles(); + @include kendo-expander--styles(); + @include kendo-panelbar--styles(); + @include kendo-splitter--styles(); + @include kendo-tile-layout--styles(); + @include kendo-dock-manager--styles(); + @include kendo-chart-wizard--styles(); // Data management - // @include grid--styles(); - // @include listview--styles(); - // @include spreadsheet--styles(); - // @include pivotgrid--styles(); - // @include treelist--styles(); - // @include filter--styles(); - // @include file-manager--styles(); - // @include task-board--styles(); + @include kendo-grid--styles(); + @include kendo-listview--styles(); + @include kendo-spreadsheet--styles(); + @include kendo-pivotgrid--styles(); + @include kendo-treelist--styles(); + @include kendo-filter--styles(); + @include kendo-file-manager--styles(); + @include kendo-task-board--styles(); // Editors - // @include editor--styles(); - // @include image-editor--styles(); + @include kendo-editor--styles(); + @include kendo-image-editor--styles(); // Scheduling - // @include gantt--styles(); - // @include scheduler--styles(); + @include kendo-gantt--styles(); + @include kendo-scheduler--styles(); // Misc - // @include adaptive--styles(); - // @include chat--styles(); - // @include media-player--styles(); - // @include timeline--styles(); - // @include pdf-viewer--styles(); - // @include scroller--styles(); - // @include scrollview--styles(); - // @include prompt--styles(); + @include kendo-adaptive--styles(); + @include kendo-chat--styles(); + @include kendo-media-player--styles(); + @include kendo-timeline--styles(); + @include kendo-pdf-viewer--styles(); + @include kendo-scroller--styles(); + @include kendo-scrollview--styles(); + @include kendo-prompt--styles(); // Dataviz - // @include dataviz--styles(); - // @include map--styles(); - // @include orgchart--styles(); - // @include signature--styles(); + @include kendo-dataviz--styles(); + @include kendo-map--styles(); + @include kendo-orgchart--styles(); + @include kendo-signature--styles(); } diff --git a/packages/bootstrap/scss/input/_index.scss b/packages/bootstrap/scss/input/_index.scss index 1847fa41930..3e2e4b0736a 100644 --- a/packages/bootstrap/scss/input/_index.scss +++ b/packages/bootstrap/scss/input/_index.scss @@ -3,14 +3,17 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; // Expose -@mixin input-styles() { +@mixin kendo-input--styles() { @include import-once( "input" ) { + @include core-styles(); + @include kendo-button--styles(); @include kendo-input--layout(); @include kendo-input--theme(); } diff --git a/packages/bootstrap/scss/input/_layout.scss b/packages/bootstrap/scss/input/_layout.scss index add445b3d2d..614ce7c6364 100644 --- a/packages/bootstrap/scss/input/_layout.scss +++ b/packages/bootstrap/scss/input/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/input/_layout.scss"; +@use "@progress/kendo-theme-default/scss/input/_layout.scss" as *; @mixin kendo-input--layout() { diff --git a/packages/bootstrap/scss/input/_theme.scss b/packages/bootstrap/scss/input/_theme.scss index 96b7c339979..5c37c103c8d 100644 --- a/packages/bootstrap/scss/input/_theme.scss +++ b/packages/bootstrap/scss/input/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/input/_theme.scss"; +@use "@progress/kendo-theme-default/scss/input/_theme.scss" as *; @mixin kendo-input--theme() { diff --git a/packages/bootstrap/scss/input/_variables.scss b/packages/bootstrap/scss/input/_variables.scss index 84bb5b8bf8e..b2bd87b6994 100644 --- a/packages/bootstrap/scss/input/_variables.scss +++ b/packages/bootstrap/scss/input/_variables.scss @@ -1,6 +1,7 @@ @use "sass:map"; @use "../core/_index.scss" as *; @use "../button/_variables.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // Input @@ -440,3 +441,132 @@ $kendo-picker-flat-hover-focus-text: null !default; /// @group picker $kendo-picker-flat-hover-focus-border: null !default; + + +@forward "@progress/kendo-theme-default/scss/input/_variables.scss" with ( + $kendo-input-default-width: $kendo-input-default-width, + $kendo-input-border-width: $kendo-input-border-width, + $kendo-input-border-height: $kendo-input-border-height, + $kendo-input-border-radius: $kendo-input-border-radius, + $kendo-input-padding-x: $kendo-input-padding-x, + $kendo-input-sm-padding-x: $kendo-input-sm-padding-x, + $kendo-input-md-padding-x: $kendo-input-md-padding-x, + $kendo-input-lg-padding-x: $kendo-input-lg-padding-x, + $kendo-input-padding-y: $kendo-input-padding-y, + $kendo-input-sm-padding-y: $kendo-input-sm-padding-y, + $kendo-input-md-padding-y: $kendo-input-md-padding-y, + $kendo-input-lg-padding-y: $kendo-input-lg-padding-y, + $kendo-input-font-family: $kendo-input-font-family, + $kendo-input-font-size: $kendo-input-font-size, + $kendo-input-sm-font-size: $kendo-input-sm-font-size, + $kendo-input-md-font-size: $kendo-input-md-font-size, + $kendo-input-lg-font-size: $kendo-input-lg-font-size, + $kendo-input-line-height: $kendo-input-line-height, + $kendo-input-sm-line-height: $kendo-input-sm-line-height, + $kendo-input-md-line-height: $kendo-input-md-line-height, + $kendo-input-lg-line-height: $kendo-input-lg-line-height, + $kendo-input-sizes: $kendo-input-sizes, + $kendo-input-bg: $kendo-input-bg, + $kendo-input-text: $kendo-input-text, + $kendo-input-border: $kendo-input-border, + $kendo-input-shadow: $kendo-input-shadow, + $kendo-input-hover-bg: $kendo-input-hover-bg, + $kendo-input-hover-text: $kendo-input-hover-text, + $kendo-input-hover-border: $kendo-input-hover-border, + $kendo-input-hover-shadow: $kendo-input-hover-shadow, + $kendo-input-focus-bg: $kendo-input-focus-bg, + $kendo-input-focus-text: $kendo-input-focus-text, + $kendo-input-focus-border: $kendo-input-focus-border, + $kendo-input-focus-shadow: $kendo-input-focus-shadow, + $kendo-input-selected-bg: $kendo-input-selected-bg, + $kendo-input-selected-text: $kendo-input-selected-text, + $kendo-input-disabled-bg: $kendo-input-disabled-bg, + $kendo-input-disabled-text: $kendo-input-disabled-text, + $kendo-input-disabled-border: $kendo-input-disabled-border, + $kendo-input-disabled-gradient: $kendo-input-disabled-gradient, + $kendo-input-disabled-shadow: $kendo-input-disabled-shadow, + $kendo-input-outline-bg: $kendo-input-outline-bg, + $kendo-input-outline-text: $kendo-input-outline-text, + $kendo-input-outline-border: $kendo-input-outline-border, + $kendo-input-outline-hover-bg: $kendo-input-outline-hover-bg, + $kendo-input-outline-hover-text: $kendo-input-outline-hover-text, + $kendo-input-outline-hover-border: $kendo-input-outline-hover-border, + $kendo-input-outline-focus-bg: $kendo-input-outline-focus-bg, + $kendo-input-outline-focus-text: $kendo-input-outline-focus-text, + $kendo-input-outline-focus-border: $kendo-input-outline-focus-border, + $kendo-input-outline-focus-shadow: $kendo-input-outline-focus-shadow, + $kendo-input-flat-bg: $kendo-input-flat-bg, + $kendo-input-flat-text: $kendo-input-flat-text, + $kendo-input-flat-border: $kendo-input-flat-border, + $kendo-input-flat-hover-bg: $kendo-input-flat-hover-bg, + $kendo-input-flat-hover-text: $kendo-input-flat-hover-text, + $kendo-input-flat-hover-border: $kendo-input-flat-hover-border, + $kendo-input-flat-focus-bg: $kendo-input-flat-focus-bg, + $kendo-input-flat-focus-text: $kendo-input-flat-focus-text, + $kendo-input-flat-focus-border: $kendo-input-flat-focus-border, + $kendo-input-flat-focus-shadow: $kendo-input-flat-focus-shadow, + $kendo-input-placeholder-text: $kendo-input-placeholder-text, + $kendo-input-placeholder-opacity: $kendo-input-placeholder-opacity, + $kendo-input-clear-value-text: $kendo-input-clear-value-text, + $kendo-input-clear-value-opacity: $kendo-input-clear-value-opacity, + $kendo-input-clear-value-hover-text: $kendo-input-clear-value-hover-text, + $kendo-input-clear-value-hover-opacity: $kendo-input-clear-value-hover-opacity, + $kendo-input-values-margin-y: $kendo-input-values-margin-y, + $kendo-input-values-margin-x: $kendo-input-values-margin-x, + $kendo-input-button-width: $kendo-input-button-width, + $kendo-input-button-border-width: $kendo-input-button-border-width, + $kendo-input-spinner-width: $kendo-input-spinner-width, + $kendo-input-spinner-icon-offset: $kendo-input-spinner-icon-offset, + $kendo-input-separator-text: $kendo-input-separator-text, + $kendo-input-separator-opacity: $kendo-input-separator-opacity, + $kendo-input-prefix-text: $kendo-input-prefix-text, + $kendo-input-suffix-text: $kendo-input-suffix-text, + $kendo-input-invalid-border: $kendo-input-invalid-border, + $kendo-input-invalid-shadow: $kendo-input-invalid-shadow, + $kendo-picker-bg: $kendo-picker-bg, + $kendo-picker-text: $kendo-picker-text, + $kendo-picker-border: $kendo-picker-border, + $kendo-picker-gradient: $kendo-picker-gradient, + $kendo-picker-shadow: $kendo-picker-shadow, + $kendo-picker-hover-bg: $kendo-picker-hover-bg, + $kendo-picker-hover-text: $kendo-picker-hover-text, + $kendo-picker-hover-border: $kendo-picker-hover-border, + $kendo-picker-hover-gradient: $kendo-picker-hover-gradient, + $kendo-picker-hover-shadow: $kendo-picker-hover-shadow, + $kendo-picker-focus-bg: $kendo-picker-focus-bg, + $kendo-picker-focus-text: $kendo-picker-focus-text, + $kendo-picker-focus-border: $kendo-picker-focus-border, + $kendo-picker-focus-gradient: $kendo-picker-focus-gradient, + $kendo-picker-focus-shadow: $kendo-picker-focus-shadow, + $kendo-picker-disabled-bg: $kendo-picker-disabled-bg, + $kendo-picker-disabled-text: $kendo-picker-disabled-text, + $kendo-picker-disabled-border: $kendo-picker-disabled-border, + $kendo-picker-disabled-gradient: $kendo-picker-disabled-gradient, + $kendo-picker-disabled-shadow: $kendo-picker-disabled-shadow, + $kendo-picker-outline-bg: $kendo-picker-outline-bg, + $kendo-picker-outline-text: $kendo-picker-outline-text, + $kendo-picker-outline-border: $kendo-picker-outline-border, + $kendo-picker-outline-hover-bg: $kendo-picker-outline-hover-bg, + $kendo-picker-outline-hover-text: $kendo-picker-outline-hover-text, + $kendo-picker-outline-hover-border: $kendo-picker-outline-hover-border, + $kendo-picker-outline-focus-bg: $kendo-picker-outline-focus-bg, + $kendo-picker-outline-focus-text: $kendo-picker-outline-focus-text, + $kendo-picker-outline-focus-border: $kendo-picker-outline-focus-border, + $kendo-picker-outline-focus-shadow: $kendo-picker-outline-focus-shadow, + $kendo-picker-outline-hover-focus-bg: $kendo-picker-outline-hover-focus-bg, + $kendo-picker-outline-hover-focus-text: $kendo-picker-outline-hover-focus-text, + $kendo-picker-outline-hover-focus-border: $kendo-picker-outline-hover-focus-border, + $kendo-picker-flat-bg: $kendo-picker-flat-bg, + $kendo-picker-flat-text: $kendo-picker-flat-text, + $kendo-picker-flat-border: $kendo-picker-flat-border, + $kendo-picker-flat-hover-bg: $kendo-picker-flat-hover-bg, + $kendo-picker-flat-hover-text: $kendo-picker-flat-hover-text, + $kendo-picker-flat-hover-border: $kendo-picker-flat-hover-border, + $kendo-picker-flat-focus-bg: $kendo-picker-flat-focus-bg, + $kendo-picker-flat-focus-text: $kendo-picker-flat-focus-text, + $kendo-picker-flat-focus-border: $kendo-picker-flat-focus-border, + $kendo-picker-flat-focus-shadow: $kendo-picker-flat-focus-shadow, + $kendo-picker-flat-hover-focus-bg: $kendo-picker-flat-hover-focus-bg, + $kendo-picker-flat-hover-focus-text: $kendo-picker-flat-hover-focus-text, + $kendo-picker-flat-hover-focus-border: $kendo-picker-flat-hover-focus-border +); diff --git a/packages/bootstrap/scss/list/_index.scss b/packages/bootstrap/scss/list/_index.scss index 535f425b94a..b5b44c3a0aa 100644 --- a/packages/bootstrap/scss/list/_index.scss +++ b/packages/bootstrap/scss/list/_index.scss @@ -1,13 +1,3 @@ -// Module meta -$_kendo-module-meta: ( - name: "list", - dependencies: ( - "checkbox", - "icon", - "no-data" - ) -); - // Component @forward "./_variables.scss"; @use "./_layout.scss" as *; @@ -20,8 +10,10 @@ $_kendo-module-meta: ( // Expose -@mixin list-styles() { +@mixin kendo-list--styles() { @include import-once( "list" ) { + @include core-styles(); + @include kendo-checkbox--styles(); @include kendo-list--layout(); @include kendo-list--theme(); } diff --git a/packages/bootstrap/scss/list/_layout.scss b/packages/bootstrap/scss/list/_layout.scss index 058437ffcb5..19db945a9ef 100644 --- a/packages/bootstrap/scss/list/_layout.scss +++ b/packages/bootstrap/scss/list/_layout.scss @@ -1,8 +1,8 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/list/_layout.scss"; +@use "@progress/kendo-theme-default/scss/list/_layout.scss" as *; @mixin kendo-list--layout() { diff --git a/packages/bootstrap/scss/list/_theme.scss b/packages/bootstrap/scss/list/_theme.scss index 4aa47f72c29..122b31b9edb 100644 --- a/packages/bootstrap/scss/list/_theme.scss +++ b/packages/bootstrap/scss/list/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/list/_theme.scss"; +@use "@progress/kendo-theme-default/scss/list/_theme.scss" as *; @mixin kendo-list--theme() { diff --git a/packages/bootstrap/scss/list/_variables.scss b/packages/bootstrap/scss/list/_variables.scss index 5658fd2e3ef..fc3a4df7e54 100644 --- a/packages/bootstrap/scss/list/_variables.scss +++ b/packages/bootstrap/scss/list/_variables.scss @@ -1,4 +1,4 @@ -@use "sass:map"; +// @use "sass:map"; @use "../core/_index.scss" as *; // List @@ -248,3 +248,90 @@ $kendo-list-group-item-shadow: null !default; /// The color of the 'Option Label' text. /// @group list $kendo-list-option-label-text: $kendo-subtle-text !default; + + +@forward "@progress/kendo-theme-default/scss/list/_variables.scss" with ( + $kendo-list-font-family: $kendo-list-font-family, + $kendo-list-font-size: $kendo-list-font-size, + $kendo-list-sm-font-size: $kendo-list-sm-font-size, + $kendo-list-md-font-size: $kendo-list-md-font-size, + $kendo-list-lg-font-size: $kendo-list-lg-font-size, + $kendo-list-line-height: $kendo-list-line-height, + $kendo-list-sm-line-height: $kendo-list-sm-line-height, + $kendo-list-md-line-height: $kendo-list-md-line-height, + $kendo-list-lg-line-height: $kendo-list-lg-line-height, + $kendo-list-header-padding-x: $kendo-list-header-padding-x, + $kendo-list-sm-header-padding-x: $kendo-list-sm-header-padding-x, + $kendo-list-md-header-padding-x: $kendo-list-md-header-padding-x, + $kendo-list-lg-header-padding-x: $kendo-list-lg-header-padding-x, + $kendo-list-header-padding-y: $kendo-list-header-padding-y, + $kendo-list-sm-header-padding-y: $kendo-list-sm-header-padding-y, + $kendo-list-md-header-padding-y: $kendo-list-md-header-padding-y, + $kendo-list-lg-header-padding-y: $kendo-list-lg-header-padding-y, + $kendo-list-header-border-width: $kendo-list-header-border-width, + $kendo-list-header-font-size: $kendo-list-header-font-size, + $kendo-list-sm-header-font-size: $kendo-list-sm-header-font-size, + $kendo-list-md-header-font-size: $kendo-list-md-header-font-size, + $kendo-list-lg-header-font-size: $kendo-list-lg-header-font-size, + $kendo-list-header-line-height: $kendo-list-header-line-height, + $kendo-list-sm-header-line-height: $kendo-list-sm-header-line-height, + $kendo-list-md-header-line-height: $kendo-list-md-header-line-height, + $kendo-list-lg-header-line-height: $kendo-list-lg-header-line-height, + $kendo-list-header-font-weight: $kendo-list-header-font-weight, + $kendo-list-item-padding-x: $kendo-list-item-padding-x, + $kendo-list-sm-item-padding-x: $kendo-list-sm-item-padding-x, + $kendo-list-md-item-padding-x: $kendo-list-md-item-padding-x, + $kendo-list-lg-item-padding-x: $kendo-list-lg-item-padding-x, + $kendo-list-item-padding-y: $kendo-list-item-padding-y, + $kendo-list-sm-item-padding-y: $kendo-list-sm-item-padding-y, + $kendo-list-md-item-padding-y: $kendo-list-md-item-padding-y, + $kendo-list-lg-item-padding-y: $kendo-list-lg-item-padding-y, + $kendo-list-item-font-size: $kendo-list-item-font-size, + $kendo-list-sm-item-font-size: $kendo-list-sm-item-font-size, + $kendo-list-md-item-font-size: $kendo-list-md-item-font-size, + $kendo-list-lg-item-font-size: $kendo-list-lg-item-font-size, + $kendo-list-item-line-height: $kendo-list-item-line-height, + $kendo-list-sm-item-line-height: $kendo-list-sm-item-line-height, + $kendo-list-md-item-line-height: $kendo-list-md-item-line-height, + $kendo-list-lg-item-line-height: $kendo-list-lg-item-line-height, + $kendo-list-group-item-padding-x: $kendo-list-group-item-padding-x, + $kendo-list-sm-group-item-padding-x: $kendo-list-sm-group-item-padding-x, + $kendo-list-md-group-item-padding-x: $kendo-list-md-group-item-padding-x, + $kendo-list-lg-group-item-padding-x: $kendo-list-lg-group-item-padding-x, + $kendo-list-group-item-padding-y: $kendo-list-group-item-padding-y, + $kendo-list-sm-group-item-padding-y: $kendo-list-sm-group-item-padding-y, + $kendo-list-md-group-item-padding-y: $kendo-list-md-group-item-padding-y, + $kendo-list-lg-group-item-padding-y: $kendo-list-lg-group-item-padding-y, + $kendo-list-group-item-border-width: $kendo-list-group-item-border-width, + $kendo-list-group-item-font-size: $kendo-list-group-item-font-size, + $kendo-list-sm-group-item-font-size: $kendo-list-sm-group-item-font-size, + $kendo-list-md-group-item-font-size: $kendo-list-md-group-item-font-size, + $kendo-list-lg-group-item-font-size: $kendo-list-lg-group-item-font-size, + $kendo-list-group-item-line-height: $kendo-list-group-item-line-height, + $kendo-list-sm-group-item-line-height: $kendo-list-sm-group-item-line-height, + $kendo-list-md-group-item-line-height: $kendo-list-md-group-item-line-height, + $kendo-list-lg-group-item-line-height: $kendo-list-lg-group-item-line-height, + $kendo-list-group-item-font-weight: $kendo-list-group-item-font-weight, + $kendo-list-sizes: $kendo-list-sizes, + $kendo-list-bg: $kendo-list-bg, + $kendo-list-text: $kendo-list-text, + $kendo-list-border: $kendo-list-border, + $kendo-list-header-bg: $kendo-list-header-bg, + $kendo-list-header-text: $kendo-list-header-text, + $kendo-list-header-border: $kendo-list-header-border, + $kendo-list-header-shadow: $kendo-list-header-shadow, + $kendo-list-item-bg: $kendo-list-item-bg, + $kendo-list-item-text: $kendo-list-item-text, + $kendo-list-item-hover-bg: $kendo-list-item-hover-bg, + $kendo-list-item-hover-text: $kendo-list-item-hover-text, + $kendo-list-item-focus-bg: $kendo-list-item-focus-bg, + $kendo-list-item-focus-text: $kendo-list-item-focus-text, + $kendo-list-item-focus-shadow: $kendo-list-item-focus-shadow, + $kendo-list-item-selected-bg: $kendo-list-item-selected-bg, + $kendo-list-item-selected-text: $kendo-list-item-selected-text, + $kendo-list-group-item-bg: $kendo-list-group-item-bg, + $kendo-list-group-item-text: $kendo-list-group-item-text, + $kendo-list-group-item-border: $kendo-list-group-item-border, + $kendo-list-group-item-shadow: $kendo-list-group-item-shadow, + $kendo-list-option-label-text: $kendo-list-option-label-text +); diff --git a/packages/bootstrap/scss/listbox/_index.scss b/packages/bootstrap/scss/listbox/_index.scss index 3484032fda1..8c0f314f6fa 100644 --- a/packages/bootstrap/scss/listbox/_index.scss +++ b/packages/bootstrap/scss/listbox/_index.scss @@ -11,9 +11,15 @@ @use "../list/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin listbox-styles() { +@mixin kendo-listbox--styles() { @include import-once( "listbox" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-icon--styles(); @include kendo-listbox--layout(); @include kendo-listbox--theme(); } diff --git a/packages/bootstrap/scss/listbox/_layout.scss b/packages/bootstrap/scss/listbox/_layout.scss index 5b69388532f..3075bd77932 100644 --- a/packages/bootstrap/scss/listbox/_layout.scss +++ b/packages/bootstrap/scss/listbox/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/listbox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/listbox/_layout.scss" as *; @mixin kendo-listbox--layout() { diff --git a/packages/bootstrap/scss/listbox/_theme.scss b/packages/bootstrap/scss/listbox/_theme.scss index ee96567fae7..9f7171369a4 100644 --- a/packages/bootstrap/scss/listbox/_theme.scss +++ b/packages/bootstrap/scss/listbox/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/listbox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/listbox/_theme.scss" as *; @mixin kendo-listbox--theme() { diff --git a/packages/bootstrap/scss/listbox/_variables.scss b/packages/bootstrap/scss/listbox/_variables.scss index bc7fd20c000..4c3406286a7 100644 --- a/packages/bootstrap/scss/listbox/_variables.scss +++ b/packages/bootstrap/scss/listbox/_variables.scss @@ -51,3 +51,22 @@ $kendo-listbox-drop-hint-width: 1px !default; /// The width of the border around the ListBox drop hint. /// @group listbox $kendo-listbox-drop-hint-border-width: null !default; + + +@forward "@progress/kendo-theme-default/scss/listbox/_variables.scss" with ( + $kendo-listbox-spacing: $kendo-listbox-spacing, + $kendo-listbox-button-spacing: $kendo-listbox-button-spacing, + $kendo-listbox-width: $kendo-listbox-width, + $kendo-listbox-default-height: $kendo-listbox-default-height, + $kendo-listbox-border-width: $kendo-listbox-border-width, + $kendo-listbox-font-family: $kendo-listbox-font-family, + $kendo-listbox-font-size: $kendo-listbox-font-size, + $kendo-listbox-line-height: $kendo-listbox-line-height, + $kendo-listbox-text: $kendo-listbox-text, + $kendo-listbox-bg: $kendo-listbox-bg, + $kendo-listbox-border: $kendo-listbox-border, + $kendo-listbox-item-padding-x: $kendo-listbox-item-padding-x, + $kendo-listbox-item-padding-y: $kendo-listbox-item-padding-y, + $kendo-listbox-drop-hint-width: $kendo-listbox-drop-hint-width, + $kendo-listbox-drop-hint-border-width: $kendo-listbox-drop-hint-border-width +); diff --git a/packages/bootstrap/scss/listgroup/_index.scss b/packages/bootstrap/scss/listgroup/_index.scss index 00b42ac66f4..dfca2ed5ff1 100644 --- a/packages/bootstrap/scss/listgroup/_index.scss +++ b/packages/bootstrap/scss/listgroup/_index.scss @@ -3,14 +3,17 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; // Expose -@mixin listgroup-styles() { +@mixin kendo-listgroup--styles() { @include import-once( "listgroup" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-listgroup--layout(); @include kendo-listgroup--theme(); } diff --git a/packages/bootstrap/scss/listgroup/_layout.scss b/packages/bootstrap/scss/listgroup/_layout.scss index e1d94e87e28..751b9f0f071 100644 --- a/packages/bootstrap/scss/listgroup/_layout.scss +++ b/packages/bootstrap/scss/listgroup/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/listgroup/_layout.scss"; +@use "@progress/kendo-theme-default/scss/listgroup/_layout.scss" as *; @mixin kendo-listgroup--layout() { diff --git a/packages/bootstrap/scss/listgroup/_theme.scss b/packages/bootstrap/scss/listgroup/_theme.scss index e3ef28b05ee..024861b01a8 100644 --- a/packages/bootstrap/scss/listgroup/_theme.scss +++ b/packages/bootstrap/scss/listgroup/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/listgroup/_theme.scss"; +@use "@progress/kendo-theme-default/scss/listgroup/_theme.scss" as *; @mixin kendo-listgroup--theme() { diff --git a/packages/bootstrap/scss/listgroup/_variables.scss b/packages/bootstrap/scss/listgroup/_variables.scss index 7dfe91dc023..5c8f71d6578 100644 --- a/packages/bootstrap/scss/listgroup/_variables.scss +++ b/packages/bootstrap/scss/listgroup/_variables.scss @@ -15,3 +15,17 @@ $kendo-listgroup-border: $kendo-component-border !default; $kendo-listgroup-item-padding-x: k-spacing(4) !default; $kendo-listgroup-item-padding-y: k-spacing(2) !default; $kendo-listgroup-item-border-width: $kendo-listgroup-border-width !default; + + +@forward "@progress/kendo-theme-default/scss/listgroup/_variables.scss" with ( + $kendo-listgroup-border-width: $kendo-listgroup-border-width, + $kendo-listgroup-border-radius: $kendo-listgroup-border-radius, + $kendo-listgroup-font-size: $kendo-listgroup-font-size, + $kendo-listgroup-line-height: $kendo-listgroup-line-height, + $kendo-listgroup-bg: $kendo-listgroup-bg, + $kendo-listgroup-text: $kendo-listgroup-text, + $kendo-listgroup-border: $kendo-listgroup-border, + $kendo-listgroup-item-padding-x: $kendo-listgroup-item-padding-x, + $kendo-listgroup-item-padding-y: $kendo-listgroup-item-padding-y, + $kendo-listgroup-item-border-width: $kendo-listgroup-item-border-width +); diff --git a/packages/bootstrap/scss/listview/_index.scss b/packages/bootstrap/scss/listview/_index.scss index 505d511571d..a7127810ae2 100644 --- a/packages/bootstrap/scss/listview/_index.scss +++ b/packages/bootstrap/scss/listview/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -11,8 +12,11 @@ // Expose -@mixin listview-styles() { +@mixin kendo-listview--styles() { @include import-once( "listview" ) { + @include core-styles(); + @include kendo-pager--styles(); + @include kendo-icon--styles(); @include kendo-listview--layout(); @include kendo-listview--theme(); @include kendo-utils--layout--display(); diff --git a/packages/bootstrap/scss/listview/_layout.scss b/packages/bootstrap/scss/listview/_layout.scss index 4ffe75f9d85..f88bad81a14 100644 --- a/packages/bootstrap/scss/listview/_layout.scss +++ b/packages/bootstrap/scss/listview/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/listview/_layout.scss"; +@use "@progress/kendo-theme-default/scss/listview/_layout.scss" as *; @mixin kendo-listview--layout() { diff --git a/packages/bootstrap/scss/listview/_theme.scss b/packages/bootstrap/scss/listview/_theme.scss index 29ac9fe1e07..9725ed77d5f 100644 --- a/packages/bootstrap/scss/listview/_theme.scss +++ b/packages/bootstrap/scss/listview/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/listview/_theme.scss"; +@use "@progress/kendo-theme-default/scss/listview/_theme.scss" as *; @mixin kendo-listview--theme() { diff --git a/packages/bootstrap/scss/listview/_variables.scss b/packages/bootstrap/scss/listview/_variables.scss index 5cd44f33e92..afc61db4edc 100644 --- a/packages/bootstrap/scss/listview/_variables.scss +++ b/packages/bootstrap/scss/listview/_variables.scss @@ -61,3 +61,25 @@ $kendo-listview-item-focus-border: null !default; /// The box shadow of the focused ListView items. /// @group listview $kendo-listview-item-focus-shadow: inset 0 0 0 3px if($kendo-enable-color-system, color-mix(in srgb, k-color( on-app-surface ) 15%, transparent), rgba( $kendo-listview-text, .15 )) !default; + + +@forward "@progress/kendo-theme-default/scss/listview/_variables.scss" with ( + $kendo-listview-padding-x: $kendo-listview-padding-x, + $kendo-listview-padding-y: $kendo-listview-padding-y, + $kendo-listview-border-width: $kendo-listview-border-width, + $kendo-listview-font-family: $kendo-listview-font-family, + $kendo-listview-font-size: $kendo-listview-font-size, + $kendo-listview-line-height: $kendo-listview-line-height, + $kendo-listview-text: $kendo-listview-text, + $kendo-listview-bg: $kendo-listview-bg, + $kendo-listview-border: $kendo-listview-border, + $kendo-listview-item-padding-x: $kendo-listview-item-padding-x, + $kendo-listview-item-padding-y: $kendo-listview-item-padding-y, + $kendo-listview-item-selected-text: $kendo-listview-item-selected-text, + $kendo-listview-item-selected-bg: $kendo-listview-item-selected-bg, + $kendo-listview-item-selected-border: $kendo-listview-item-selected-border, + $kendo-listview-item-focus-text: $kendo-listview-item-focus-text, + $kendo-listview-item-focus-bg: $kendo-listview-item-focus-bg, + $kendo-listview-item-focus-border: $kendo-listview-item-focus-border, + $kendo-listview-item-focus-shadow: $kendo-listview-item-focus-shadow +); diff --git a/packages/bootstrap/scss/loader/_index.scss b/packages/bootstrap/scss/loader/_index.scss index b63632dea0f..53095254570 100644 --- a/packages/bootstrap/scss/loader/_index.scss +++ b/packages/bootstrap/scss/loader/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -10,8 +11,10 @@ // Expose -@mixin loader-styles() { +@mixin kendo-loader--styles() { @include import-once( "loader" ) { + @include core-styles(); + @include kendo-overlay--styles(); @include kendo-loader--layout(); @include kendo-loader--theme(); @include kendo-utils--typography--text-color(); diff --git a/packages/bootstrap/scss/loader/_layout.scss b/packages/bootstrap/scss/loader/_layout.scss index b07553808fe..26daa47b060 100644 --- a/packages/bootstrap/scss/loader/_layout.scss +++ b/packages/bootstrap/scss/loader/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "../overlay/_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/loader/_layout.scss"; +@use "@progress/kendo-theme-default/scss/loader/_layout.scss" as *; @mixin kendo-loader--layout() { diff --git a/packages/bootstrap/scss/loader/_theme.scss b/packages/bootstrap/scss/loader/_theme.scss index 102dace5436..2554060bb82 100644 --- a/packages/bootstrap/scss/loader/_theme.scss +++ b/packages/bootstrap/scss/loader/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/loader/_theme.scss"; +@use "@progress/kendo-theme-default/scss/loader/_theme.scss" as *; @mixin kendo-loader--theme() { diff --git a/packages/bootstrap/scss/loader/_variables.scss b/packages/bootstrap/scss/loader/_variables.scss index 468ed77f8ff..8591577dd4c 100644 --- a/packages/bootstrap/scss/loader/_variables.scss +++ b/packages/bootstrap/scss/loader/_variables.scss @@ -126,3 +126,44 @@ $kendo-loading-opacity: .3 !default; /// The z-index of the Loading indicator. /// @group loading $kendo-zindex-loading: 100 !default; + + +@forward "@progress/kendo-theme-default/scss/loader/_variables.scss" with ( + $kendo-loader-segment-border-radius: $kendo-loader-segment-border-radius, + $kendo-loader-sm-segment-size: $kendo-loader-sm-segment-size, + $kendo-loader-md-segment-size: $kendo-loader-md-segment-size, + $kendo-loader-lg-segment-size: $kendo-loader-lg-segment-size, + $kendo-loader-sm-padding: $kendo-loader-sm-padding, + $kendo-loader-md-padding: $kendo-loader-md-padding, + $kendo-loader-lg-padding: $kendo-loader-lg-padding, + $kendo-loader-sm-spinner-3-width: $kendo-loader-sm-spinner-3-width, + $kendo-loader-md-spinner-3-width: $kendo-loader-md-spinner-3-width, + $kendo-loader-lg-spinner-3-width: $kendo-loader-lg-spinner-3-width, + $kendo-loader-sm-spinner-3-height: $kendo-loader-sm-spinner-3-height, + $kendo-loader-md-spinner-3-height: $kendo-loader-md-spinner-3-height, + $kendo-loader-lg-spinner-3-height: $kendo-loader-lg-spinner-3-height, + $kendo-loader-sm-spinner-4-width: $kendo-loader-sm-spinner-4-width, + $kendo-loader-md-spinner-4-width: $kendo-loader-md-spinner-4-width, + $kendo-loader-lg-spinner-4-width: $kendo-loader-lg-spinner-4-width, + $kendo-loader-sm-spinner-4-height: $kendo-loader-sm-spinner-4-height, + $kendo-loader-md-spinner-4-height: $kendo-loader-md-spinner-4-height, + $kendo-loader-lg-spinner-4-height: $kendo-loader-lg-spinner-4-height, + $kendo-loader-container-panel-border-width: $kendo-loader-container-panel-border-width, + $kendo-loader-container-panel-border-style: $kendo-loader-container-panel-border-style, + $kendo-loader-container-panel-border-color: $kendo-loader-container-panel-border-color, + $kendo-loader-container-panel-border-radius: $kendo-loader-container-panel-border-radius, + $kendo-loader-container-panel-bg: $kendo-loader-container-panel-bg, + $kendo-loader-sm-container-padding: $kendo-loader-sm-container-padding, + $kendo-loader-md-container-padding: $kendo-loader-md-container-padding, + $kendo-loader-lg-container-padding: $kendo-loader-lg-container-padding, + $kendo-loader-sm-container-gap: $kendo-loader-sm-container-gap, + $kendo-loader-md-container-gap: $kendo-loader-md-container-gap, + $kendo-loader-lg-container-gap: $kendo-loader-lg-container-gap, + $kendo-loader-sm-container-font-size: $kendo-loader-sm-container-font-size, + $kendo-loader-md-container-font-size: $kendo-loader-md-container-font-size, + $kendo-loader-lg-container-font-size: $kendo-loader-lg-container-font-size, + $kendo-loading-bg: $kendo-loading-bg, + $kendo-loading-text: $kendo-loading-text, + $kendo-loading-opacity: $kendo-loading-opacity, + $kendo-zindex-loading: $kendo-zindex-loading +); diff --git a/packages/bootstrap/scss/map/_index.scss b/packages/bootstrap/scss/map/_index.scss index d22d781fc57..edac89bedc6 100644 --- a/packages/bootstrap/scss/map/_index.scss +++ b/packages/bootstrap/scss/map/_index.scss @@ -12,8 +12,12 @@ // Expose -@mixin map-styles() { +@mixin kendo-map--styles() { @include import-once( "map" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-scroller--styles(); + @include kendo-icon--styles(); @include kendo-map--layout(); @include kendo-map--theme(); } diff --git a/packages/bootstrap/scss/map/_layout.scss b/packages/bootstrap/scss/map/_layout.scss index fb70fcc6a0d..4d81525a0ec 100644 --- a/packages/bootstrap/scss/map/_layout.scss +++ b/packages/bootstrap/scss/map/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/map/_layout.scss"; +@use "@progress/kendo-theme-default/scss/map/_layout.scss" as *; @mixin kendo-map--layout() { diff --git a/packages/bootstrap/scss/map/_theme.scss b/packages/bootstrap/scss/map/_theme.scss index 9ce2eb009d9..e94f99da91f 100644 --- a/packages/bootstrap/scss/map/_theme.scss +++ b/packages/bootstrap/scss/map/_theme.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../button/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/map/_theme.scss"; +@use "@progress/kendo-theme-default/scss/map/_theme.scss" as *; @mixin kendo-map--theme() { diff --git a/packages/bootstrap/scss/map/_variables.scss b/packages/bootstrap/scss/map/_variables.scss index fa884e91083..5b7fc1c88a7 100644 --- a/packages/bootstrap/scss/map/_variables.scss +++ b/packages/bootstrap/scss/map/_variables.scss @@ -1,7 +1,8 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "../button/_variables.scss" as *; +@use "../icon/_variables.scss" as *; // Map /// The border width of the Map. @@ -56,10 +57,10 @@ $kendo-map-zoom-control-button-padding-y: $kendo-map-zoom-control-button-padding /// The horizontal padding of the Map attribution. /// @group map -$kendo-map-attribution-padding-x: $kendo-padding-sm-x !default; +$kendo-map-attribution-padding-x: k-spacing(2) !default; /// The vertical padding of the Map attribution. /// @group map -$kendo-map-attribution-padding-y: $kendo-padding-sm-y !default; +$kendo-map-attribution-padding-y: k-spacing(1) !default; /// The font size of the Map attribution. /// @group map $kendo-map-attribution-font-size: calc( #{$kendo-map-font-size} * .75 ) !default; @@ -71,4 +72,29 @@ $kendo-map-attribution-bg: if($kendo-enable-color-system, color-mix(in srgb, k-c /// @group map $kendo-map-marker-fill: $kendo-color-primary !default; -$kendo-map-marker-images: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAABQCAYAAAAKlxWDAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA35JREFUeNrsWF1IVEEUPu7amhKUmqUUkhEYYn9PamgbROKTEERB1HNP0pMvJUVhZQhCEEQPQiAIkiQIQShEZmg99SdLgiRJpbGmGIu/aZ2zzJXrvWf2zty7PgTzwQd3Z86Z796z58wMJ+PruXxQwCHkGeRpZDbyqBh/j1xA9iN7kJ+8FsrwECSRu8hSUMMosgnZLTMIScaLkUPIpxpiIGyfCN9iVcEo8h2yCvyjSqwR9RIkgz5kHgRHnlhrg2im7blEhCPCeW89fBJyKuohsv8IRPaV46uGYfnLhyTn3/bC4seXnFtErFmBHHcmzSCy2umRWVgC+ZfvQ1bZ8ZSfsxQbgl+PrsCfqXFu+jWyxh7Ss5xY1sFKKLzd5ymWtEWbpC36MKgWGuuCzdyXFTR2QGhbrvKfRrbkQ74Mmi3BKJf6FEYdMbso+UpKJkpJU+dKkPIaNoyrM5Mw23Edlj6/WQ957qVbEM4rcoWX1lgcGXQuURfi6o2y0YmVH2Mw2XgC5od6ksJEeqaxlW+joLIGaZFgGVcCTsx13YG1xKxrnMZoTmUN0iLB7c7R8M49LktJnSWxwMxxa5AWu5f+XV6EzQIJznHJwSWSDNlM+Fanv3OmcyQY43YNVyzOX2XLhMZoTvEviJHgsHOU9kYntuwthaLWV5BTWQ/hHbuSpGcaozmVNUiL9lIqfNfr7L7Rq7SlyfbVnzfZsjhFXzggTuoNoI14bf63thj5kK/kNvDCytIm5yzt+vF7F9jak4qhbbz1ouzEaLJv3t3iCNkYGtzCpq7Vrm9lKcNo2TIJJ/Kk23keHhB3kQLPAxhJUDiACXEkJcMYd2uzrhiRNNX5MrJW5Al7pxkQBjNpEJtxislubWRwjKtPDQyLNQZU76UTIu4NPsQahO+EzkXYwgNu60uBmPAB3Zu3HS0agp62KoJdsvAwf0NXOgQptdsU7NqEbWBBQrso4FQl0K56AKsggXzokVyJdAqmWjThlZl+BeOSsD32CLdvQSsxVu1XF2Sr7iVKB5T6nbbfnYol41vQWdwtus6ZPgRp+3pme950QV9fpito+jSmT2P6NKZP479PE9Lp06jC6tMwUO/T6CJwn0YXgfs0uvj/+jS6CNyn0UXgPo0uZH0aEnzueruRwUBfSb5Mr5TQb/o0pk9j+jSmT2P6NKZPY/o0pk9j+jQ+8E+AAQDpbNHEyW7DTAAAAABJRU5ErkJggg=="; +$kendo-map-marker-images: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAABQCAYAAAAKlxWDAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA35JREFUeNrsWF1IVEEUPu7amhKUmqUUkhEYYn9PamgbROKTEERB1HNP0pMvJUVhZQhCEEQPQiAIkiQIQShEZmg99SdLgiRJpbGmGIu/aZ2zzJXrvWf2zty7PgTzwQd3Z86Z796z58wMJ+PruXxQwCHkGeRpZDbyqBh/j1xA9iN7kJ+8FsrwECSRu8hSUMMosgnZLTMIScaLkUPIpxpiIGyfCN9iVcEo8h2yCvyjSqwR9RIkgz5kHgRHnlhrg2im7blEhCPCeW89fBJyKuohsv8IRPaV46uGYfnLhyTn3/bC4seXnFtErFmBHHcmzSCy2umRWVgC+ZfvQ1bZ8ZSfsxQbgl+PrsCfqXFu+jWyxh7Ss5xY1sFKKLzd5ymWtEWbpC36MKgWGuuCzdyXFTR2QGhbrvKfRrbkQ74Mmi3BKJf6FEYdMbso+UpKJkpJU+dKkPIaNoyrM5Mw23Edlj6/WQ957qVbEM4rcoWX1lgcGXQuURfi6o2y0YmVH2Mw2XgC5od6ksJEeqaxlW+joLIGaZFgGVcCTsx13YG1xKxrnMZoTmUN0iLB7c7R8M49LktJnSWxwMxxa5AWu5f+XV6EzQIJznHJwSWSDNlM+Fanv3OmcyQY43YNVyzOX2XLhMZoTvEviJHgsHOU9kYntuwthaLWV5BTWQ/hHbuSpGcaozmVNUiL9lIqfNfr7L7Rq7SlyfbVnzfZsjhFXzggTuoNoI14bf63thj5kK/kNvDCytIm5yzt+vF7F9jak4qhbbz1ouzEaLJv3t3iCNkYGtzCpq7Vrm9lKcNo2TIJJ/Kk23keHhB3kQLPAxhJUDiACXEkJcMYd2uzrhiRNNX5MrJW5Al7pxkQBjNpEJtxislubWRwjKtPDQyLNQZU76UTIu4NPsQahO+EzkXYwgNu60uBmPAB3Zu3HS0agp62KoJdsvAwf0NXOgQptdsU7NqEbWBBQrso4FQl0K56AKsggXzokVyJdAqmWjThlZl+BeOSsD32CLdvQSsxVu1XF2Sr7iVKB5T6nbbfnYol41vQWdwtus6ZPgRp+3pme950QV9fpito+jSmT2P6NKZP479PE9Lp06jC6tMwUO/T6CJwn0YXgfs0uvj/+jS6CNyn0UXgPo0uZH0aEnzueruRwUBfSb5Mr5TQb/o0pk9j+jSmT2P6NKZPY/o0pk9j+jQ+8E+AAQDpbNHEyW7DTAAAAABJRU5ErkJggg==" !default; + + +@forward "@progress/kendo-theme-default/scss/map/_variables.scss" with ( + $kendo-map-border-width: $kendo-map-border-width, + $kendo-map-font-size: $kendo-map-font-size, + $kendo-map-line-height: $kendo-map-line-height, + $kendo-map-font-family: $kendo-map-font-family, + $kendo-map-bg: $kendo-map-bg, + $kendo-map-text: $kendo-map-text, + $kendo-map-border: $kendo-map-border, + $kendo-map-navigator-margin: $kendo-map-navigator-margin, + $kendo-map-navigator-padding: $kendo-map-navigator-padding, + $kendo-map-navigator-width: $kendo-map-navigator-width, + $kendo-map-navigator-height: $kendo-map-navigator-height, + $kendo-map-navigator-border-width: $kendo-map-navigator-border-width, + $kendo-map-zoom-control-margin: $kendo-map-zoom-control-margin, + $kendo-map-zoom-control-button-padding-x: $kendo-map-zoom-control-button-padding-x, + $kendo-map-zoom-control-button-padding-y: $kendo-map-zoom-control-button-padding-y, + $kendo-map-attribution-padding-x: $kendo-map-attribution-padding-x, + $kendo-map-attribution-padding-y: $kendo-map-attribution-padding-y, + $kendo-map-attribution-font-size: $kendo-map-attribution-font-size, + $kendo-map-attribution-bg: $kendo-map-attribution-bg, + $kendo-map-marker-fill: $kendo-map-marker-fill, + // $kendo-map-marker-images: $kendo-map-marker-images +); diff --git a/packages/bootstrap/scss/maskedtextbox/_index.scss b/packages/bootstrap/scss/maskedtextbox/_index.scss index a5dd2c3137e..8613f50a1b3 100644 --- a/packages/bootstrap/scss/maskedtextbox/_index.scss +++ b/packages/bootstrap/scss/maskedtextbox/_index.scss @@ -10,10 +10,15 @@ @use "../floating-label/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin maskedtextbox-styles() { - @include import-once( "maskedtextbox" ) { - @include kendo-maskedtextbox--layout(); - @include kendo-maskedtextbox--theme(); +@mixin kendo-masked-textbox--styles() { + @include import-once( "masked-textbox" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); + @include kendo-icon--styles(); + @include kendo-masked-textbox--layout(); + @include kendo-masked-textbox--theme(); } } diff --git a/packages/bootstrap/scss/maskedtextbox/_layout.scss b/packages/bootstrap/scss/maskedtextbox/_layout.scss index 39169958cb8..20c1e6762e7 100644 --- a/packages/bootstrap/scss/maskedtextbox/_layout.scss +++ b/packages/bootstrap/scss/maskedtextbox/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/maskedtextbox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/maskedtextbox/_layout.scss" as *; @mixin kendo-masked-textbox--layout() { diff --git a/packages/bootstrap/scss/maskedtextbox/_theme.scss b/packages/bootstrap/scss/maskedtextbox/_theme.scss index 32ef4805fda..0f3cda0f758 100644 --- a/packages/bootstrap/scss/maskedtextbox/_theme.scss +++ b/packages/bootstrap/scss/maskedtextbox/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/maskedtextbox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/maskedtextbox/_theme.scss" as *; @mixin kendo-masked-textbox--theme() { diff --git a/packages/bootstrap/scss/mediaplayer/_index.scss b/packages/bootstrap/scss/mediaplayer/_index.scss index 2eb84727931..300159b789d 100644 --- a/packages/bootstrap/scss/mediaplayer/_index.scss +++ b/packages/bootstrap/scss/mediaplayer/_index.scss @@ -12,8 +12,12 @@ // Expose -@mixin mediaplayer-styles() { - @include import-once( "mediaplayer" ) { +@mixin kendo-media-player--styles() { + @include import-once( "media-player" ) { + @include core-styles(); + @include kendo-slider--styles(); + @include kendo-toolbar--styles(); + @include kendo-icon--styles(); @include kendo-media-player--layout(); @include kendo-media-player--theme(); } diff --git a/packages/bootstrap/scss/mediaplayer/_layout.scss b/packages/bootstrap/scss/mediaplayer/_layout.scss index d4b3b418760..bf89b2a6a23 100644 --- a/packages/bootstrap/scss/mediaplayer/_layout.scss +++ b/packages/bootstrap/scss/mediaplayer/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/mediaplayer/_layout.scss"; +@use "@progress/kendo-theme-default/scss/mediaplayer/_layout.scss" as *; @mixin kendo-media-player--layout() { diff --git a/packages/bootstrap/scss/mediaplayer/_theme.scss b/packages/bootstrap/scss/mediaplayer/_theme.scss index 95c14bffd21..2a5ea7a3e81 100644 --- a/packages/bootstrap/scss/mediaplayer/_theme.scss +++ b/packages/bootstrap/scss/mediaplayer/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/mediaplayer/_theme.scss"; +@use "@progress/kendo-theme-default/scss/mediaplayer/_theme.scss" as *; @mixin kendo-media-player--theme() { diff --git a/packages/bootstrap/scss/mediaplayer/_variables.scss b/packages/bootstrap/scss/mediaplayer/_variables.scss index 0026148726a..755e763a88d 100644 --- a/packages/bootstrap/scss/mediaplayer/_variables.scss +++ b/packages/bootstrap/scss/mediaplayer/_variables.scss @@ -44,3 +44,20 @@ $kendo-media-player-titlebar-border: null !default; /// The gradient of the MediaPlayer title. /// @group mediaplayer $kendo-media-player-titlebar-gradient: if($kendo-enable-color-system, ( color-mix(in srgb, k-color( on-app-surface ) 70%, transparent), color-mix(in srgb, k-color( on-app-surface ) 0%, transparent) ), ( rgba( $kendo-media-player-text, .7 ), rgba( $kendo-media-player-text, 0 ) )) !default; + + +@forward "@progress/kendo-theme-default/scss/mediaplayer/_variables.scss" with ( + $kendo-media-player-border-width: $kendo-media-player-border-width, + $kendo-media-player-font-family: $kendo-media-player-font-family, + $kendo-media-player-font-size: $kendo-media-player-font-size, + $kendo-media-player-line-height: $kendo-media-player-line-height, + $kendo-media-player-bg: $kendo-media-player-bg, + $kendo-media-player-text: $kendo-media-player-text, + $kendo-media-player-border: $kendo-media-player-border, + $kendo-media-player-titlebar-padding-x: $kendo-media-player-titlebar-padding-x, + $kendo-media-player-titlebar-padding-y: $kendo-media-player-titlebar-padding-y, + $kendo-media-player-titlebar-bg: $kendo-media-player-titlebar-bg, + $kendo-media-player-titlebar-text: $kendo-media-player-titlebar-text, + $kendo-media-player-titlebar-border: $kendo-media-player-titlebar-border, + $kendo-media-player-titlebar-gradient: $kendo-media-player-titlebar-gradient +); diff --git a/packages/bootstrap/scss/menu-button/_index.scss b/packages/bootstrap/scss/menu-button/_index.scss index af943fe97ac..dd17ac873ab 100644 --- a/packages/bootstrap/scss/menu-button/_index.scss +++ b/packages/bootstrap/scss/menu-button/_index.scss @@ -11,8 +11,11 @@ // Expose -@mixin menu-button-styles() { +@mixin kendo-menu-button--styles() { @include import-once( "menu-button" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-menu--styles(); @include kendo-menu-button--layout(); @include kendo-menu-button--theme(); } diff --git a/packages/bootstrap/scss/menu-button/_layout.scss b/packages/bootstrap/scss/menu-button/_layout.scss index 262a2c81026..c868a550806 100644 --- a/packages/bootstrap/scss/menu-button/_layout.scss +++ b/packages/bootstrap/scss/menu-button/_layout.scss @@ -1,6 +1,6 @@ @use "./_variables.scss" as *; @use "../button/variables.scss" as *; -@import "@progress/kendo-theme-default/scss/menu-button/_layout.scss"; +@use "@progress/kendo-theme-default/scss/menu-button/_layout.scss" as *; @mixin kendo-menu-button--layout() { diff --git a/packages/bootstrap/scss/menu-button/_theme.scss b/packages/bootstrap/scss/menu-button/_theme.scss index 5102184feab..57845e82d7c 100644 --- a/packages/bootstrap/scss/menu-button/_theme.scss +++ b/packages/bootstrap/scss/menu-button/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/menu-button/_theme.scss"; +@use "@progress/kendo-theme-default/scss/menu-button/_theme.scss" as *; @mixin kendo-menu-button--theme() { diff --git a/packages/bootstrap/scss/menu-button/_variables.scss b/packages/bootstrap/scss/menu-button/_variables.scss index a0ab1243185..d6790bf6ed2 100644 --- a/packages/bootstrap/scss/menu-button/_variables.scss +++ b/packages/bootstrap/scss/menu-button/_variables.scss @@ -7,3 +7,8 @@ /// The horizontal padding of the button arrow in the Menu Button. /// @group menu-button $kendo-menu-button-arrow-padding-x: $kendo-button-padding-y !default; + + +@forward "@progress/kendo-theme-default/scss/menu-button/_variables.scss" with ( + $kendo-menu-button-arrow-padding-x: $kendo-menu-button-arrow-padding-x +); diff --git a/packages/bootstrap/scss/menu/_index.scss b/packages/bootstrap/scss/menu/_index.scss index 072d7973567..d3d3d15dc1d 100644 --- a/packages/bootstrap/scss/menu/_index.scss +++ b/packages/bootstrap/scss/menu/_index.scss @@ -13,8 +13,13 @@ // Expose -@mixin menu-styles() { +@mixin kendo-menu--styles() { @include import-once( "menu" ) { + @include core-styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-icon--styles(); + @include kendo-button--styles(); @include kendo-menu--layout(); @include kendo-menu--theme(); } diff --git a/packages/bootstrap/scss/menu/_layout.scss b/packages/bootstrap/scss/menu/_layout.scss index df71a465a3d..e480247240e 100644 --- a/packages/bootstrap/scss/menu/_layout.scss +++ b/packages/bootstrap/scss/menu/_layout.scss @@ -1,7 +1,7 @@ -@use "../core/_index.scss" as *; +@use "../_variables.scss" as *; @use "./_variables.scss" as *; -@use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/menu/_layout.scss"; +@use "@progress/kendo-theme-default/scss/menu/_layout.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; @mixin kendo-menu--layout() { diff --git a/packages/bootstrap/scss/menu/_theme.scss b/packages/bootstrap/scss/menu/_theme.scss index 5fa5c2a89cf..73fd6de5368 100644 --- a/packages/bootstrap/scss/menu/_theme.scss +++ b/packages/bootstrap/scss/menu/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/menu/_theme.scss"; +@use "@progress/kendo-theme-default/scss/menu/_theme.scss" as *; @mixin kendo-menu--theme() { diff --git a/packages/bootstrap/scss/menu/_variables.scss b/packages/bootstrap/scss/menu/_variables.scss index 6f8b504b68d..ef15bb7def3 100644 --- a/packages/bootstrap/scss/menu/_variables.scss +++ b/packages/bootstrap/scss/menu/_variables.scss @@ -139,10 +139,10 @@ $kendo-menu-scroll-button-hover-gradient: null !default; /// The inline margin of the horizontal Menu separator. /// @group menu -$kendo-menu-separator-margin-inline: k-spacing(1); +$kendo-menu-separator-margin-inline: k-spacing(1) !default; /// The block margin of the horizontal Menu separator. /// @group menu -$kendo-menu-separator-margin-block: k-spacing(2);; +$kendo-menu-separator-margin-block: k-spacing(2) !default; /// The border color of Menu separator. /// @group menu $kendo-menu-separator-border: if($kendo-enable-color-system, k-color(border), $kendo-component-border) !default; @@ -271,3 +271,95 @@ $kendo-menu-popup-item-active-gradient: null !default; /// The base shadow of focused Menu item in popup. /// @group menu $kendo-menu-popup-item-focus-shadow: $kendo-menu-item-focus-shadow !default; + + +@forward "@progress/kendo-theme-default/scss/menu/_variables.scss" with ( + $kendo-menu-border-width: $kendo-menu-border-width, + $kendo-menu-font-family: $kendo-menu-font-family, + $kendo-menu-font-size: $kendo-menu-font-size, + $kendo-menu-line-height: $kendo-menu-line-height, + $kendo-menu-bg: $kendo-menu-bg, + $kendo-menu-text: $kendo-menu-text, + $kendo-menu-border: $kendo-menu-border, + $kendo-menu-gradient: $kendo-menu-gradient, + $kendo-menu-item-padding-x: $kendo-menu-item-padding-x, + $kendo-menu-item-padding-y: $kendo-menu-item-padding-y, + $kendo-menu-item-spacing: $kendo-menu-item-spacing, + $kendo-menu-item-icon-spacing: $kendo-menu-item-icon-spacing, + $kendo-menu-item-selected-font-weight: $kendo-menu-item-selected-font-weight, + $kendo-menu-item-bg: $kendo-menu-item-bg, + $kendo-menu-item-text: $kendo-menu-item-text, + $kendo-menu-item-border: $kendo-menu-item-border, + $kendo-menu-item-gradient: $kendo-menu-item-gradient, + $kendo-menu-item-hover-bg: $kendo-menu-item-hover-bg, + $kendo-menu-item-hover-text: $kendo-menu-item-hover-text, + $kendo-menu-item-hover-border: $kendo-menu-item-hover-border, + $kendo-menu-item-hover-gradient: $kendo-menu-item-hover-gradient, + $kendo-menu-item-active-bg: $kendo-menu-item-active-bg, + $kendo-menu-item-active-text: $kendo-menu-item-active-text, + $kendo-menu-item-active-border: $kendo-menu-item-active-border, + $kendo-menu-item-active-gradient: $kendo-menu-item-active-gradient, + $kendo-menu-item-focus-shadow: $kendo-menu-item-focus-shadow, + $kendo-menu-item-selected-bg: $kendo-menu-item-selected-bg, + $kendo-menu-item-selected-text: $kendo-menu-item-selected-text, + $kendo-menu-item-selected-border: $kendo-menu-item-selected-border, + $kendo-menu-item-selected-gradient: $kendo-menu-item-selected-gradient, + // $kendo-menu-scroll-button-bg: $kendo-menu-scroll-button-bg, + $kendo-menu-scroll-button-text: $kendo-menu-scroll-button-text, + $kendo-menu-scroll-button-border: $kendo-menu-scroll-button-border, + $kendo-menu-scroll-button-gradient: $kendo-menu-scroll-button-gradient, + $kendo-menu-scroll-button-hover-bg: $kendo-menu-scroll-button-hover-bg, + $kendo-menu-scroll-button-hover-text: $kendo-menu-scroll-button-hover-text, + $kendo-menu-scroll-button-hover-border: $kendo-menu-scroll-button-hover-border, + $kendo-menu-scroll-button-hover-gradient: $kendo-menu-scroll-button-hover-gradient, + // $kendo-menu-separator-margin-inline: $kendo-menu-separator-margin-inline, + // $kendo-menu-separator-margin-block: $kendo-menu-separator-margin-block, + $kendo-menu-separator-border: $kendo-menu-separator-border, + $kendo-menu-popup-padding-x: $kendo-menu-popup-padding-x, + $kendo-menu-popup-padding-y: $kendo-menu-popup-padding-y, + $kendo-menu-popup-border-width: $kendo-menu-popup-border-width, + $kendo-menu-popup-font-size: $kendo-menu-popup-font-size, + $kendo-menu-popup-sm-font-size: $kendo-menu-popup-sm-font-size, + $kendo-menu-popup-md-font-size: $kendo-menu-popup-md-font-size, + $kendo-menu-popup-lg-font-size: $kendo-menu-popup-lg-font-size, + $kendo-menu-popup-line-height: $kendo-menu-popup-line-height, + $kendo-menu-popup-sm-line-height: $kendo-menu-popup-sm-line-height, + $kendo-menu-popup-md-line-height: $kendo-menu-popup-md-line-height, + $kendo-menu-popup-lg-line-height: $kendo-menu-popup-lg-line-height, + $kendo-menu-popup-bg: $kendo-menu-popup-bg, + $kendo-menu-popup-text: $kendo-menu-popup-text, + $kendo-menu-popup-border: $kendo-menu-popup-border, + $kendo-menu-popup-gradient: $kendo-menu-popup-gradient, + $kendo-menu-popup-item-padding-x: $kendo-menu-popup-item-padding-x, + $kendo-menu-popup-sm-item-padding-x: $kendo-menu-popup-sm-item-padding-x, + $kendo-menu-popup-md-item-padding-x: $kendo-menu-popup-md-item-padding-x, + $kendo-menu-popup-lg-item-padding-x: $kendo-menu-popup-lg-item-padding-x, + $kendo-menu-popup-item-padding-y: $kendo-menu-popup-item-padding-y, + $kendo-menu-popup-sm-item-padding-y: $kendo-menu-popup-sm-item-padding-y, + $kendo-menu-popup-md-item-padding-y: $kendo-menu-popup-md-item-padding-y, + $kendo-menu-popup-lg-item-padding-y: $kendo-menu-popup-lg-item-padding-y, + $kendo-menu-popup-item-padding-end: $kendo-menu-popup-item-padding-end, + $kendo-menu-popup-sm-item-padding-end: $kendo-menu-popup-sm-item-padding-end, + $kendo-menu-popup-md-item-padding-end: $kendo-menu-popup-md-item-padding-end, + $kendo-menu-popup-lg-item-padding-end: $kendo-menu-popup-lg-item-padding-end, + $kendo-menu-popup-sm-item-icon-margin-start: $kendo-menu-popup-sm-item-icon-margin-start, + $kendo-menu-popup-md-item-icon-margin-start: $kendo-menu-popup-md-item-icon-margin-start, + $kendo-menu-popup-lg-item-icon-margin-start: $kendo-menu-popup-lg-item-icon-margin-start, + $kendo-menu-popup-sm-item-icon-margin-end: $kendo-menu-popup-sm-item-icon-margin-end, + $kendo-menu-popup-md-item-icon-margin-end: $kendo-menu-popup-md-item-icon-margin-end, + $kendo-menu-popup-lg-item-icon-margin-end: $kendo-menu-popup-lg-item-icon-margin-end, + $kendo-menu-popup-item-spacing: $kendo-menu-popup-item-spacing, + $kendo-menu-popup-item-bg: $kendo-menu-popup-item-bg, + $kendo-menu-popup-item-text: $kendo-menu-popup-item-text, + $kendo-menu-popup-item-border: $kendo-menu-popup-item-border, + $kendo-menu-popup-item-gradient: $kendo-menu-popup-item-gradient, + $kendo-menu-popup-item-hover-bg: $kendo-menu-popup-item-hover-bg, + $kendo-menu-popup-item-hover-text: $kendo-menu-popup-item-hover-text, + $kendo-menu-popup-item-hover-border: $kendo-menu-popup-item-hover-border, + $kendo-menu-popup-item-hover-gradient: $kendo-menu-popup-item-hover-gradient, + $kendo-menu-popup-item-active-bg: $kendo-menu-popup-item-active-bg, + $kendo-menu-popup-item-active-text: $kendo-menu-popup-item-active-text, + $kendo-menu-popup-item-active-border: $kendo-menu-popup-item-active-border, + $kendo-menu-popup-item-active-gradient: $kendo-menu-popup-item-active-gradient, + $kendo-menu-popup-item-focus-shadow: $kendo-menu-popup-item-focus-shadow +); diff --git a/packages/bootstrap/scss/messagebox/_index.scss b/packages/bootstrap/scss/messagebox/_index.scss index 7e7f82f5b4f..add12032b55 100644 --- a/packages/bootstrap/scss/messagebox/_index.scss +++ b/packages/bootstrap/scss/messagebox/_index.scss @@ -8,9 +8,12 @@ @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin messagebox-styles() { +@mixin kendo-messagebox--styles() { @include import-once( "messagebox" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-messagebox--layout(); @include kendo-messagebox--theme(); } diff --git a/packages/bootstrap/scss/messagebox/_layout.scss b/packages/bootstrap/scss/messagebox/_layout.scss index d40ec4de653..6aedf0c474e 100644 --- a/packages/bootstrap/scss/messagebox/_layout.scss +++ b/packages/bootstrap/scss/messagebox/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/messagebox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/messagebox/_layout.scss" as *; @mixin kendo-messagebox--layout() { diff --git a/packages/bootstrap/scss/messagebox/_theme.scss b/packages/bootstrap/scss/messagebox/_theme.scss index 845f57c9961..9615bc7748c 100644 --- a/packages/bootstrap/scss/messagebox/_theme.scss +++ b/packages/bootstrap/scss/messagebox/_theme.scss @@ -1,5 +1,5 @@ @use "../core/_index.scss" as *; -@import "@progress/kendo-theme-default/scss/messagebox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/messagebox/_theme.scss" as *; @mixin kendo-messagebox--theme() { diff --git a/packages/bootstrap/scss/messagebox/_variables.scss b/packages/bootstrap/scss/messagebox/_variables.scss index 1f6fbdc06a8..6d1a2c67eb8 100644 --- a/packages/bootstrap/scss/messagebox/_variables.scss +++ b/packages/bootstrap/scss/messagebox/_variables.scss @@ -1,11 +1,11 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; // Message box $kendo-message-box-margin: 0 0 k-spacing(4) 0 !default; -$kendo-message-box-padding-x: $kendo-padding-md-x !default; -$kendo-message-box-padding-y: $kendo-padding-md-y !default; +$kendo-message-box-padding-x: k-spacing(4) !default; +$kendo-message-box-padding-y: k-spacing(1) !default; $kendo-message-box-border-width: 0 0 0 4px !default; $kendo-message-box-font-size: var( --kendo-font-size, inherit ) !default; @@ -17,3 +17,18 @@ $kendo-message-box-border-level: -9 !default; $kendo-message-box-link-font-style: normal !default; $kendo-message-box-link-text-decoration: underline !default; + + +@forward "@progress/kendo-theme-default/scss/messagebox/_variables.scss" with ( + $kendo-message-box-margin: $kendo-message-box-margin, + $kendo-message-box-padding-x: $kendo-message-box-padding-x, + $kendo-message-box-padding-y: $kendo-message-box-padding-y, + $kendo-message-box-border-width: $kendo-message-box-border-width, + $kendo-message-box-font-size: $kendo-message-box-font-size, + $kendo-message-box-line-height: $kendo-message-box-line-height, + $kendo-message-box-bg-level: $kendo-message-box-bg-level, + $kendo-message-box-text-level: $kendo-message-box-text-level, + $kendo-message-box-border-level: $kendo-message-box-border-level, + $kendo-message-box-link-font-style: $kendo-message-box-link-font-style, + $kendo-message-box-link-text-decoration: $kendo-message-box-link-text-decoration +); diff --git a/packages/bootstrap/scss/multiselect/_index.scss b/packages/bootstrap/scss/multiselect/_index.scss index 0165dbc92a7..60fce0cbeab 100644 --- a/packages/bootstrap/scss/multiselect/_index.scss +++ b/packages/bootstrap/scss/multiselect/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @@ -13,9 +14,18 @@ @use "../list/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin multiselect-styles() { +@mixin kendo-multiselect--styles() { @include import-once( "multiselect" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-input--styles(); + @include kendo-chip--styles(); + @include kendo-floating-label--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-icon--styles(); @include kendo-multiselect--layout(); @include kendo-multiselect--theme(); } diff --git a/packages/bootstrap/scss/multiselect/_layout.scss b/packages/bootstrap/scss/multiselect/_layout.scss index bc37f17be6a..3b513404dbf 100644 --- a/packages/bootstrap/scss/multiselect/_layout.scss +++ b/packages/bootstrap/scss/multiselect/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/multiselect/_layout.scss"; +@use "@progress/kendo-theme-default/scss/multiselect/_layout.scss" as *; @mixin kendo-multiselect--layout() { diff --git a/packages/bootstrap/scss/multiselect/_theme.scss b/packages/bootstrap/scss/multiselect/_theme.scss index fc1fe8124a3..73f3eac6fd8 100644 --- a/packages/bootstrap/scss/multiselect/_theme.scss +++ b/packages/bootstrap/scss/multiselect/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/multiselect/_theme.scss"; +@use "@progress/kendo-theme-default/scss/multiselect/_theme.scss" as *; @mixin kendo-multiselect--theme() { diff --git a/packages/bootstrap/scss/no-data/_layout.scss b/packages/bootstrap/scss/no-data/_layout.scss index 5f300e60c20..1f4b31267ff 100644 --- a/packages/bootstrap/scss/no-data/_layout.scss +++ b/packages/bootstrap/scss/no-data/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/no-data/_layout.scss"; +@use "@progress/kendo-theme-default/scss/no-data/_layout.scss" as *; @mixin kendo-no-data--layout() { @include kendo-no-data--layout-base(); diff --git a/packages/bootstrap/scss/no-data/_theme.scss b/packages/bootstrap/scss/no-data/_theme.scss index 40ceb595274..931e524aee1 100644 --- a/packages/bootstrap/scss/no-data/_theme.scss +++ b/packages/bootstrap/scss/no-data/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/no-data/_theme.scss"; +@use "@progress/kendo-theme-default/scss/no-data/_theme.scss" as *; @mixin kendo-no-data--theme() { @include kendo-no-data--theme-base(); diff --git a/packages/bootstrap/scss/no-data/_variables.scss b/packages/bootstrap/scss/no-data/_variables.scss index 4748b042c76..8fde6a5a344 100644 --- a/packages/bootstrap/scss/no-data/_variables.scss +++ b/packages/bootstrap/scss/no-data/_variables.scss @@ -5,3 +5,9 @@ $kendo-no-data-min-height: 140px !default; /// The color of the 'No Data' text. /// @group no-data $kendo-no-data-text: $kendo-subtle-text !default; + + +@forward "@progress/kendo-theme-default/scss/no-data/_variables.scss" with ( + $kendo-no-data-min-height: $kendo-no-data-min-height, + $kendo-no-data-text: $kendo-no-data-text +); diff --git a/packages/bootstrap/scss/notification/_functions.scss b/packages/bootstrap/scss/notification/_functions.scss new file mode 100644 index 00000000000..fbe57338999 --- /dev/null +++ b/packages/bootstrap/scss/notification/_functions.scss @@ -0,0 +1,17 @@ +@use "sass:map"; +@use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; + +@function notification-theme( $colors ) { + $_theme: (); + + @each $name, $color in $colors { + $_theme: map.merge(( $name: ( + color: if($kendo-enable-color-system, k-color( #{$name}-on-subtle ), k-color-shade( $color, 6 )), + background-color: if($kendo-enable-color-system, k-color( #{$name}-subtle ), k-color-tint( $color, 9 )), + border: if($kendo-enable-color-system, k-color( #{$name}-emphasis ), k-color-tint( $color, 10 )), + )), $_theme ); + } + + @return $_theme; +} diff --git a/packages/bootstrap/scss/notification/_index.scss b/packages/bootstrap/scss/notification/_index.scss index 8514a5cb4a9..93de9eebfbe 100644 --- a/packages/bootstrap/scss/notification/_index.scss +++ b/packages/bootstrap/scss/notification/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../popup/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin notification-styles() { +@mixin kendo-notification--styles() { @include import-once( "notification" ) { + @include core-styles(); + @include kendo-popup--styles(); + @include kendo-icon--styles(); @include kendo-notification--layout(); @include kendo-notification--theme(); } diff --git a/packages/bootstrap/scss/notification/_layout.scss b/packages/bootstrap/scss/notification/_layout.scss index cc2e67d766a..b6be2d648ea 100644 --- a/packages/bootstrap/scss/notification/_layout.scss +++ b/packages/bootstrap/scss/notification/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/notification/_layout.scss"; +@use "@progress/kendo-theme-default/scss/notification/_layout.scss" as *; @mixin kendo-notification--layout() { diff --git a/packages/bootstrap/scss/notification/_theme.scss b/packages/bootstrap/scss/notification/_theme.scss index 59b080aa73a..b727b79f514 100644 --- a/packages/bootstrap/scss/notification/_theme.scss +++ b/packages/bootstrap/scss/notification/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/notification/_theme.scss"; +@use "@progress/kendo-theme-default/scss/notification/_theme.scss" as *; @mixin kendo-notification--theme() { diff --git a/packages/bootstrap/scss/notification/_variables.scss b/packages/bootstrap/scss/notification/_variables.scss index 0bcb0244d8b..76ed5e98cd0 100644 --- a/packages/bootstrap/scss/notification/_variables.scss +++ b/packages/bootstrap/scss/notification/_variables.scss @@ -1,7 +1,9 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "./_functions.scss" as *; @use "../popup/_variables.scss" as *; @use "../icon/_variables.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // Notification @@ -47,23 +49,28 @@ $kendo-notification-shadow: $kendo-popup-shadow !default; /// @group notification $kendo-notification-icon-spacing: $kendo-icon-spacing !default; -@function notification-theme( $colors ) { - $_theme: (); - - @each $name, $color in $colors { - $_theme: k-map-merge(( $name: ( - color: if($kendo-enable-color-system, k-color( #{$name}-on-subtle ), k-color-shade( $color, 6 )), - background-color: if($kendo-enable-color-system, k-color( #{$name}-subtle ), k-color-tint( $color, 9 )), - border: if($kendo-enable-color-system, k-color( #{$name}-emphasis ), k-color-tint( $color, 10 )), - )), $_theme ); - } - - @return $_theme; -} - /// The theme colors map for the Notification. /// @group notification $kendo-notification-theme-colors: $kendo-theme-colors !default; /// The generated theme colors map for the Notification. /// @group notification $kendo-notification-theme: notification-theme( $kendo-notification-theme-colors ) !default; + + +@forward "@progress/kendo-theme-default/scss/notification/_variables.scss" with ( + $kendo-notification-group-gap: $kendo-notification-group-gap, + $kendo-notification-padding-x: $kendo-notification-padding-x, + $kendo-notification-padding-y: $kendo-notification-padding-y, + $kendo-notification-border-width: $kendo-notification-border-width, + $kendo-notification-border-radius: $kendo-notification-border-radius, + $kendo-notification-font-family: $kendo-notification-font-family, + $kendo-notification-font-size: $kendo-notification-font-size, + $kendo-notification-line-height: $kendo-notification-line-height, + $kendo-notification-bg: $kendo-notification-bg, + $kendo-notification-text: $kendo-notification-text, + $kendo-notification-border: $kendo-notification-border, + $kendo-notification-shadow: $kendo-notification-shadow, + $kendo-notification-icon-spacing: $kendo-notification-icon-spacing, + $kendo-notification-theme-colors: $kendo-notification-theme-colors, + $kendo-notification-theme: $kendo-notification-theme +); diff --git a/packages/bootstrap/scss/numerictextbox/_index.scss b/packages/bootstrap/scss/numerictextbox/_index.scss index ff26335313a..8e7ed59fbda 100644 --- a/packages/bootstrap/scss/numerictextbox/_index.scss +++ b/packages/bootstrap/scss/numerictextbox/_index.scss @@ -4,17 +4,22 @@ @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @use "../floating-label/_index.scss" as *; @use "../icons/_index.scss" as *; -@use "../button/_index.scss" as *; + // Expose -@mixin numerictextbox-styles() { - @include import-once( "numerictextbox" ) { - @include kendo-numerictextbox--layout(); - @include kendo-numerictextbox--theme(); +@mixin kendo-numeric-textbox--styles() { + @include import-once( "numeric-textbox" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); + @include kendo-icon--styles(); + @include kendo-numeric-textbox--layout(); + @include kendo-numeric-textbox--theme(); } } diff --git a/packages/bootstrap/scss/numerictextbox/_layout.scss b/packages/bootstrap/scss/numerictextbox/_layout.scss index 88a1b4007a4..be792e947af 100644 --- a/packages/bootstrap/scss/numerictextbox/_layout.scss +++ b/packages/bootstrap/scss/numerictextbox/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/numerictextbox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/numerictextbox/_layout.scss" as *; @mixin kendo-numeric-textbox--layout() { diff --git a/packages/bootstrap/scss/numerictextbox/_theme.scss b/packages/bootstrap/scss/numerictextbox/_theme.scss index 875522c7697..72195ffaa0c 100644 --- a/packages/bootstrap/scss/numerictextbox/_theme.scss +++ b/packages/bootstrap/scss/numerictextbox/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/numerictextbox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/numerictextbox/_theme.scss" as *; @mixin kendo-numeric-textbox--theme() { diff --git a/packages/bootstrap/scss/orgchart/_index.scss b/packages/bootstrap/scss/orgchart/_index.scss index b2084a850bf..2386b8ac412 100644 --- a/packages/bootstrap/scss/orgchart/_index.scss +++ b/packages/bootstrap/scss/orgchart/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -15,9 +16,19 @@ @use "../card/_index.scss" as *; @use "../window/_index.scss" as *; + // Expose -@mixin orgchart-styles() { +@mixin kendo-orgchart--styles() { @include import-once( "orgchart" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-form--styles(); + @include kendo-textbox--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-upload--styles(); + @include kendo-menu--styles(); + @include kendo-card--styles(); + @include kendo-window--styles(); @include kendo-orgchart--layout(); @include kendo-orgchart--theme(); @include kendo-utils--layout--overflow(); diff --git a/packages/bootstrap/scss/orgchart/_layout.scss b/packages/bootstrap/scss/orgchart/_layout.scss index 8616804731b..42f6da234d6 100644 --- a/packages/bootstrap/scss/orgchart/_layout.scss +++ b/packages/bootstrap/scss/orgchart/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/orgchart/_layout.scss"; +@use "@progress/kendo-theme-default/scss/orgchart/_layout.scss" as *; @mixin kendo-orgchart--layout() { diff --git a/packages/bootstrap/scss/orgchart/_theme.scss b/packages/bootstrap/scss/orgchart/_theme.scss index e4bdba044de..e500c9790d4 100644 --- a/packages/bootstrap/scss/orgchart/_theme.scss +++ b/packages/bootstrap/scss/orgchart/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/orgchart/_theme.scss"; +@use "@progress/kendo-theme-default/scss/orgchart/_theme.scss" as *; @mixin kendo-orgchart--theme() { diff --git a/packages/bootstrap/scss/orgchart/_variables.scss b/packages/bootstrap/scss/orgchart/_variables.scss index 662cdadcd75..6ccc79bb6b2 100644 --- a/packages/bootstrap/scss/orgchart/_variables.scss +++ b/packages/bootstrap/scss/orgchart/_variables.scss @@ -150,3 +150,51 @@ $kendo-orgchart-line-fill: $kendo-base-border !default; /// The height of the OrgChart connecting line. /// @group orgchart $kendo-orgchart-line-v-height: k-spacing(6) !default; + + +@forward "@progress/kendo-theme-default/scss/orgchart/_variables.scss" with ( + $kendo-orgchart-spacer: $kendo-orgchart-spacer, + $kendo-orgchart-padding-y: $kendo-orgchart-padding-y, + $kendo-orgchart-padding-x: $kendo-orgchart-padding-x, + $kendo-orgchart-font-family: $kendo-orgchart-font-family, + $kendo-orgchart-font-size: $kendo-orgchart-font-size, + $kendo-orgchart-line-height: $kendo-orgchart-line-height, + $kendo-orgchart-bg: $kendo-orgchart-bg, + $kendo-orgchart-text: $kendo-orgchart-text, + $kendo-orgchart-border: $kendo-orgchart-border, + $kendo-orgchart-node-gap: $kendo-orgchart-node-gap, + $kendo-orgchart-group-gap: $kendo-orgchart-group-gap, + $kendo-orgchart-node-container-gap: $kendo-orgchart-node-container-gap, + $kendo-orgchart-node-group-padding-y: $kendo-orgchart-node-group-padding-y, + $kendo-orgchart-node-group-padding-x: $kendo-orgchart-node-group-padding-x, + $kendo-orgchart-node-group-border-width: $kendo-orgchart-node-group-border-width, + $kendo-orgchart-node-group-border-radius: $kendo-orgchart-node-group-border-radius, + $kendo-orgchart-node-group-bg: $kendo-orgchart-node-group-bg, + $kendo-orgchart-node-group-text: $kendo-orgchart-node-group-text, + $kendo-orgchart-node-group-border: $kendo-orgchart-node-group-border, + $kendo-orgchart-node-group-focus-border: $kendo-orgchart-node-group-focus-border, + $kendo-orgchart-node-group-focus-shadow: $kendo-orgchart-node-group-focus-shadow, + $kendo-orgchart-node-group-title-font-size: $kendo-orgchart-node-group-title-font-size, + $kendo-orgchart-node-group-title-margin-bottom: $kendo-orgchart-node-group-title-margin-bottom, + $kendo-orgchart-node-group-title-line-height: $kendo-orgchart-node-group-title-line-height, + $kendo-orgchart-node-group-subtitle-margin-bottom: $kendo-orgchart-node-group-subtitle-margin-bottom, + $kendo-orgchart-node-group-subtitle-font-size: $kendo-orgchart-node-group-subtitle-font-size, + $kendo-orgchart-node-group-subtitle-text: $kendo-orgchart-node-group-subtitle-text, + $kendo-orgchart-card-width: $kendo-orgchart-card-width, + $kendo-orgchart-card-padding-y: $kendo-orgchart-card-padding-y, + $kendo-orgchart-card-padding-x: $kendo-orgchart-card-padding-x, + $kendo-orgchart-card-border-width: $kendo-orgchart-card-border-width, + $kendo-orgchart-card-shadow: $kendo-orgchart-card-shadow, + $kendo-orgchart-card-focus-shadow: $kendo-orgchart-card-focus-shadow, + $kendo-orgchart-card-title-margin-bottom: $kendo-orgchart-card-title-margin-bottom, + $kendo-orgchart-card-title-font-size: $kendo-orgchart-card-title-font-size, + $kendo-orgchart-card-subtitle-margin-bottom: $kendo-orgchart-card-subtitle-margin-bottom, + $kendo-orgchart-card-subtitle-font-size: $kendo-orgchart-card-subtitle-font-size, + $kendo-orgchart-card-body-border-width: $kendo-orgchart-card-body-border-width, + $kendo-orgchart-card-body-border-color: $kendo-orgchart-card-body-border-color, + $kendo-orgchart-card-body-vbox-margin-right: $kendo-orgchart-card-body-vbox-margin-right, + $kendo-orgchart-card-body-vbox-min-height: $kendo-orgchart-card-body-vbox-min-height, + $kendo-orgchart-line-size: $kendo-orgchart-line-size, + $kendo-orgchart-line-fill: $kendo-orgchart-line-fill, + $kendo-orgchart-line-v-height: $kendo-orgchart-line-v-height +); diff --git a/packages/bootstrap/scss/overlay/_index.scss b/packages/bootstrap/scss/overlay/_index.scss index 86124698468..65fb662df49 100644 --- a/packages/bootstrap/scss/overlay/_index.scss +++ b/packages/bootstrap/scss/overlay/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin overlay-styles() { +@mixin kendo-overlay--styles() { @include import-once( "overlay" ) { + @include core-styles(); @include kendo-overlay--layout(); @include kendo-overlay--theme(); } diff --git a/packages/bootstrap/scss/overlay/_layout.scss b/packages/bootstrap/scss/overlay/_layout.scss index dd7ee8b2534..d2b8a73740d 100644 --- a/packages/bootstrap/scss/overlay/_layout.scss +++ b/packages/bootstrap/scss/overlay/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/overlay/_layout.scss"; +@use "@progress/kendo-theme-default/scss/overlay/_layout.scss" as *; @mixin kendo-overlay--layout() { diff --git a/packages/bootstrap/scss/overlay/_theme.scss b/packages/bootstrap/scss/overlay/_theme.scss index f2105c3d936..4f7f9288d25 100644 --- a/packages/bootstrap/scss/overlay/_theme.scss +++ b/packages/bootstrap/scss/overlay/_theme.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/overlay/_theme.scss"; +@use "@progress/kendo-theme-default/scss/overlay/_theme.scss" as *; @mixin kendo-overlay--theme() { diff --git a/packages/bootstrap/scss/overlay/_variables.scss b/packages/bootstrap/scss/overlay/_variables.scss index 32f74941c12..022b86c3313 100644 --- a/packages/bootstrap/scss/overlay/_variables.scss +++ b/packages/bootstrap/scss/overlay/_variables.scss @@ -5,3 +5,10 @@ $kendo-overlay-theme-colors: $kendo-theme-colors !default; $kendo-overlay-bg: $kendo-color-black !default; $kendo-overlay-opacity: .5 !default; + + +@forward "@progress/kendo-theme-default/scss/overlay/_variables.scss" with ( + $kendo-overlay-theme-colors: $kendo-overlay-theme-colors, + $kendo-overlay-bg: $kendo-overlay-bg, + $kendo-overlay-opacity: $kendo-overlay-opacity +); diff --git a/packages/bootstrap/scss/pager/_index.scss b/packages/bootstrap/scss/pager/_index.scss index b4b7268b1ca..49cb998cf1e 100644 --- a/packages/bootstrap/scss/pager/_index.scss +++ b/packages/bootstrap/scss/pager/_index.scss @@ -3,15 +3,21 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../dropdownlist/_index.scss" as *; @use "../icons/_index.scss" as *; @use "../button/_index.scss" as *; + // Expose -@mixin pager-styles() { +@mixin kendo-pager--styles() { @include import-once( "pager" ) { + @include core-styles(); + @include kendo-dropdown-list--styles(); + @include kendo-icon--styles(); + @include kendo-button--styles(); @include kendo-pager--layout(); @include kendo-pager--theme(); } diff --git a/packages/bootstrap/scss/pager/_layout.scss b/packages/bootstrap/scss/pager/_layout.scss index b4cb0feba6b..d7013f9a853 100644 --- a/packages/bootstrap/scss/pager/_layout.scss +++ b/packages/bootstrap/scss/pager/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/pager/_layout.scss"; +@use "@progress/kendo-theme-default/scss/pager/_layout.scss" as *; @mixin kendo-pager--layout() { diff --git a/packages/bootstrap/scss/pager/_theme.scss b/packages/bootstrap/scss/pager/_theme.scss index 96e8e91fb52..deb857efc15 100644 --- a/packages/bootstrap/scss/pager/_theme.scss +++ b/packages/bootstrap/scss/pager/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/pager/_theme.scss"; +@use "@progress/kendo-theme-default/scss/pager/_theme.scss" as *; @mixin kendo-pager--theme() { diff --git a/packages/bootstrap/scss/pager/_variables.scss b/packages/bootstrap/scss/pager/_variables.scss index b5f01a67fde..95537336495 100644 --- a/packages/bootstrap/scss/pager/_variables.scss +++ b/packages/bootstrap/scss/pager/_variables.scss @@ -173,3 +173,52 @@ $kendo-pager-sizes: ( pager-dropdown-width: $kendo-pager-lg-dropdown-width ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/pager/_variables.scss" with ( + $kendo-pager-padding-x: $kendo-pager-padding-x, + $kendo-pager-sm-padding-x: $kendo-pager-sm-padding-x, + $kendo-pager-md-padding-x: $kendo-pager-md-padding-x, + $kendo-pager-lg-padding-x: $kendo-pager-lg-padding-x, + $kendo-pager-padding-y: $kendo-pager-padding-y, + $kendo-pager-sm-padding-y: $kendo-pager-sm-padding-y, + $kendo-pager-md-padding-y: $kendo-pager-md-padding-y, + $kendo-pager-lg-padding-y: $kendo-pager-lg-padding-y, + $kendo-pager-sm-item-min-width: $kendo-pager-sm-item-min-width, + $kendo-pager-md-item-min-width: $kendo-pager-md-item-min-width, + $kendo-pager-lg-item-min-width: $kendo-pager-lg-item-min-width, + $kendo-pager-sm-item-group-spacing: $kendo-pager-sm-item-group-spacing, + $kendo-pager-md-item-group-spacing: $kendo-pager-md-item-group-spacing, + $kendo-pager-lg-item-group-spacing: $kendo-pager-lg-item-group-spacing, + $kendo-pager-border-width: $kendo-pager-border-width, + $kendo-pager-font-family: $kendo-pager-font-family, + $kendo-pager-font-size: $kendo-pager-font-size, + $kendo-pager-line-height: $kendo-pager-line-height, + $kendo-pager-bg: $kendo-pager-bg, + $kendo-pager-text: $kendo-pager-text, + $kendo-pager-border: $kendo-pager-border, + $kendo-pager-focus-bg: $kendo-pager-focus-bg, + $kendo-pager-focus-shadow: $kendo-pager-focus-shadow, + // $kendo-pager-section-spacing: $kendo-pager-section-spacing, + $kendo-pager-item-border-width: $kendo-pager-item-border-width, + $kendo-pager-item-border-radius: $kendo-pager-item-border-radius, + $kendo-pager-item-spacing: $kendo-pager-item-spacing, + $kendo-pager-item-bg: $kendo-pager-item-bg, + $kendo-pager-item-text: $kendo-pager-item-text, + $kendo-pager-item-border: $kendo-pager-item-border, + $kendo-pager-item-hover-bg: $kendo-pager-item-hover-bg, + $kendo-pager-item-hover-text: $kendo-pager-item-hover-text, + $kendo-pager-item-hover-border: $kendo-pager-item-hover-border, + $kendo-pager-item-selected-bg: $kendo-pager-item-selected-bg, + $kendo-pager-item-selected-text: $kendo-pager-item-selected-text, + $kendo-pager-item-selected-border: $kendo-pager-item-selected-border, + $kendo-pager-item-focus-opacity: $kendo-pager-item-focus-opacity, + $kendo-pager-item-focus-bg: $kendo-pager-item-focus-bg, + $kendo-pager-item-focus-shadow: $kendo-pager-item-focus-shadow, + $kendo-pager-number-border-radius: $kendo-pager-number-border-radius, + $kendo-pager-input-width: $kendo-pager-input-width, + $kendo-pager-sm-dropdown-width: $kendo-pager-sm-dropdown-width, + $kendo-pager-md-dropdown-width: $kendo-pager-md-dropdown-width, + $kendo-pager-lg-dropdown-width: $kendo-pager-lg-dropdown-width, + $kendo-pager-sizes: $kendo-pager-sizes +); diff --git a/packages/bootstrap/scss/panel/_index.scss b/packages/bootstrap/scss/panel/_index.scss index 3a6b654d758..abe6372feb6 100644 --- a/packages/bootstrap/scss/panel/_index.scss +++ b/packages/bootstrap/scss/panel/_index.scss @@ -1,16 +1,18 @@ // Component -@import "./_variables.scss"; -@import "./_layout.scss"; -@import "./_theme.scss"; +@forward "./_variables.scss"; +@use "./_layout.scss" as *; +@use "./_theme.scss" as *; // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as*; + // Expose @mixin kendo-panel--styles() { @include import-once( "panel" ) { + @include core-styles(); @include kendo-panel--layout(); @include kendo-panel--theme(); } diff --git a/packages/bootstrap/scss/panel/_layout.scss b/packages/bootstrap/scss/panel/_layout.scss index 185accf5548..dffcaa7ba69 100644 --- a/packages/bootstrap/scss/panel/_layout.scss +++ b/packages/bootstrap/scss/panel/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/panel/_layout.scss"; +@use "@progress/kendo-theme-default/scss/panel/_layout.scss" as *; @mixin kendo-panel--layout() { @include kendo-panel--layout--base(); diff --git a/packages/bootstrap/scss/panel/_theme.scss b/packages/bootstrap/scss/panel/_theme.scss index c2ed469ecfd..dc80a431e4e 100644 --- a/packages/bootstrap/scss/panel/_theme.scss +++ b/packages/bootstrap/scss/panel/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/panel/_theme.scss"; +@use "@progress/kendo-theme-default/scss/panel/_theme.scss" as *; @mixin kendo-panel--theme() { @include kendo-panel--theme--base(); diff --git a/packages/bootstrap/scss/panel/_variables.scss b/packages/bootstrap/scss/panel/_variables.scss index 2e474b76c26..081e0ce2030 100644 --- a/packages/bootstrap/scss/panel/_variables.scss +++ b/packages/bootstrap/scss/panel/_variables.scss @@ -1,34 +1,49 @@ +@use "../core/_index.scss" as *; /// The border radius of the Panel. /// @group panel -$kendo-panel-border-radius: k-border-radius(md); +$kendo-panel-border-radius: k-border-radius(md) !default; /// The width of the border around the Panel. /// @group panel -$kendo-panel-border-width: 1px; +$kendo-panel-border-width: 1px !default; /// The style of the border around the Panel. /// @group panel -$kendo-panel-border-style: solid; +$kendo-panel-border-style: solid !default; /// The inline padding of the Panel header. /// @group panel -$kendo-panel-header-padding-inline: k-spacing(2); +$kendo-panel-header-padding-inline: k-spacing(2) !default; /// The block padding of the Panel header. /// @group panel -$kendo-panel-header-padding-block: k-spacing(1); +$kendo-panel-header-padding-block: k-spacing(1) !default; /// The inline padding of the Panel content. /// @group panel -$kendo-panel-content-padding-inline: k-spacing(2); +$kendo-panel-content-padding-inline: k-spacing(2) !default; /// The block padding of the Panel content. /// @group panel -$kendo-panel-content-padding-block: k-spacing(1); +$kendo-panel-content-padding-block: k-spacing(1) !default; /// The text color of the Panel. /// @group panel -$kendo-panel-text: var(--kendo-component-text, #{$kendo-component-text}); +$kendo-panel-text: var(--kendo-component-text, #{$kendo-component-text}) !default; /// The background color of the Panel. /// @group panel -$kendo-panel-bg: var(--kendo-component-bg, #{$kendo-component-bg}); +$kendo-panel-bg: var(--kendo-component-bg, #{$kendo-component-bg}) !default; /// The color of the border around the Panel. /// @group panel -$kendo-panel-border: var(--kendo-component-border, #{$kendo-component-border}); +$kendo-panel-border: var(--kendo-component-border, #{$kendo-component-border}) !default; + + +// @forward "@progress/kendo-theme-default/scss/panel/_variables.scss" with ( + // $kendo-panel-border-radius: $kendo-panel-border-radius, + // $kendo-panel-border-width: $kendo-panel-border-width, + // $kendo-panel-border-style: $kendo-panel-border-style, + // $kendo-panel-header-padding-inline: $kendo-panel-header-padding-inline, + // $kendo-panel-header-padding-block: $kendo-panel-header-padding-block, + // $kendo-panel-content-padding-inline: $kendo-panel-content-padding-inline, + // $kendo-panel-content-padding-block: $kendo-panel-content-padding-block, + // $kendo-panel-text: $kendo-panel-text, + // $kendo-panel-bg: $kendo-panel-bg, + // $kendo-panel-border: $kendo-panel-border +// ); diff --git a/packages/bootstrap/scss/panelbar/_index.scss b/packages/bootstrap/scss/panelbar/_index.scss index dd62d731a74..ddf1ba0ab79 100644 --- a/packages/bootstrap/scss/panelbar/_index.scss +++ b/packages/bootstrap/scss/panelbar/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; @use "../list/_index.scss" as *; + // Expose -@mixin panelbar-styles() { +@mixin kendo-panelbar--styles() { @include import-once( "panelbar" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-list--styles(); @include kendo-panelbar--layout(); @include kendo-panelbar--theme(); } diff --git a/packages/bootstrap/scss/panelbar/_layout.scss b/packages/bootstrap/scss/panelbar/_layout.scss index 1c38eb10ee0..ceca921e41b 100644 --- a/packages/bootstrap/scss/panelbar/_layout.scss +++ b/packages/bootstrap/scss/panelbar/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/panelbar/_layout.scss"; +@use "@progress/kendo-theme-default/scss/panelbar/_layout.scss" as *; @mixin kendo-panelbar--layout() { diff --git a/packages/bootstrap/scss/panelbar/_theme.scss b/packages/bootstrap/scss/panelbar/_theme.scss index 7e4e4b747c3..4ed288b85df 100644 --- a/packages/bootstrap/scss/panelbar/_theme.scss +++ b/packages/bootstrap/scss/panelbar/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/panelbar/_theme.scss"; +@use "@progress/kendo-theme-default/scss/panelbar/_theme.scss" as *; @mixin kendo-panelbar--theme() { diff --git a/packages/bootstrap/scss/panelbar/_variables.scss b/packages/bootstrap/scss/panelbar/_variables.scss index f8f247b96a9..be9de9e725b 100644 --- a/packages/bootstrap/scss/panelbar/_variables.scss +++ b/packages/bootstrap/scss/panelbar/_variables.scss @@ -273,3 +273,90 @@ $kendo-panelbar-header-expanded-border: null !default; /// The gradient of the expanded PanelBar header. /// @group panelbar $kendo-panelbar-header-expanded-gradient: null !default; + + +@forward "@progress/kendo-theme-default/scss/panelbar/_variables.scss" with ( + $kendo-panelbar-padding-x: $kendo-panelbar-padding-x, + $kendo-panelbar-padding-y: $kendo-panelbar-padding-y, + $kendo-panelbar-font-family: $kendo-panelbar-font-family, + $kendo-panelbar-font-size: $kendo-panelbar-font-size, + $kendo-panelbar-line-height: $kendo-panelbar-line-height, + $kendo-panelbar-border-width: $kendo-panelbar-border-width, + $kendo-panelbar-border-style: $kendo-panelbar-border-style, + $kendo-panelbar-item-border-width: $kendo-panelbar-item-border-width, + $kendo-panelbar-item-border-style: $kendo-panelbar-item-border-style, + $kendo-panelbar-header-padding-x: $kendo-panelbar-header-padding-x, + $kendo-panelbar-header-padding-y: $kendo-panelbar-header-padding-y, + $kendo-panelbar-item-padding-x: $kendo-panelbar-item-padding-x, + $kendo-panelbar-item-padding-y: $kendo-panelbar-item-padding-y, + $kendo-panelbar-item-level-count: $kendo-panelbar-item-level-count, + $kendo-panelbar-bg: $kendo-panelbar-bg, + $kendo-panelbar-text: $kendo-panelbar-text, + $kendo-panelbar-border: $kendo-panelbar-border, + $kendo-panelbar-header-bg: $kendo-panelbar-header-bg, + $kendo-panelbar-header-text: $kendo-panelbar-header-text, + $kendo-panelbar-header-border: $kendo-panelbar-header-border, + $kendo-panelbar-header-gradient: $kendo-panelbar-header-gradient, + $kendo-panelbar-header-hover-bg: $kendo-panelbar-header-hover-bg, + $kendo-panelbar-header-hover-text: $kendo-panelbar-header-hover-text, + $kendo-panelbar-header-hover-border: $kendo-panelbar-header-hover-border, + $kendo-panelbar-header-hover-gradient: $kendo-panelbar-header-hover-gradient, + $kendo-panelbar-header-focus-bg: $kendo-panelbar-header-focus-bg, + $kendo-panelbar-header-focus-text: $kendo-panelbar-header-focus-text, + $kendo-panelbar-header-focus-border: $kendo-panelbar-header-focus-border, + $kendo-panelbar-header-focus-gradient: $kendo-panelbar-header-focus-gradient, + $kendo-panelbar-header-focus-shadow: $kendo-panelbar-header-focus-shadow, + $kendo-panelbar-header-hover-focus-bg: $kendo-panelbar-header-hover-focus-bg, + $kendo-panelbar-header-hover-focus-text: $kendo-panelbar-header-hover-focus-text, + $kendo-panelbar-header-hover-focus-border: $kendo-panelbar-header-hover-focus-border, + $kendo-panelbar-header-hover-focus-gradient: $kendo-panelbar-header-hover-focus-gradient, + $kendo-panelbar-header-selected-bg: $kendo-panelbar-header-selected-bg, + $kendo-panelbar-header-selected-text: $kendo-panelbar-header-selected-text, + $kendo-panelbar-header-selected-border: $kendo-panelbar-header-selected-border, + $kendo-panelbar-header-selected-gradient: $kendo-panelbar-header-selected-gradient, + $kendo-panelbar-header-selected-hover-bg: $kendo-panelbar-header-selected-hover-bg, + $kendo-panelbar-header-selected-hover-text: $kendo-panelbar-header-selected-hover-text, + $kendo-panelbar-header-selected-hover-border: $kendo-panelbar-header-selected-hover-border, + $kendo-panelbar-header-selected-hover-gradient: $kendo-panelbar-header-selected-hover-gradient, + $kendo-panelbar-header-selected-focus-bg: $kendo-panelbar-header-selected-focus-bg, + $kendo-panelbar-header-selected-focus-text: $kendo-panelbar-header-selected-focus-text, + $kendo-panelbar-header-selected-focus-border: $kendo-panelbar-header-selected-focus-border, + $kendo-panelbar-header-selected-focus-gradient: $kendo-panelbar-header-selected-focus-gradient, + $kendo-panelbar-header-selected-hover-focus-bg: $kendo-panelbar-header-selected-hover-focus-bg, + $kendo-panelbar-header-selected-hover-focus-text: $kendo-panelbar-header-selected-hover-focus-text, + $kendo-panelbar-header-selected-hover-focus-border: $kendo-panelbar-header-selected-hover-focus-border, + $kendo-panelbar-header-selected-hover-focus-gradient: $kendo-panelbar-header-selected-hover-focus-gradient, + $kendo-panelbar-item-hover-bg: $kendo-panelbar-item-hover-bg, + $kendo-panelbar-item-hover-text: $kendo-panelbar-item-hover-text, + $kendo-panelbar-item-hover-border: $kendo-panelbar-item-hover-border, + $kendo-panelbar-item-hover-gradient: $kendo-panelbar-item-hover-gradient, + $kendo-panelbar-item-focus-bg: $kendo-panelbar-item-focus-bg, + $kendo-panelbar-item-focus-text: $kendo-panelbar-item-focus-text, + $kendo-panelbar-item-focus-border: $kendo-panelbar-item-focus-border, + $kendo-panelbar-item-focus-gradient: $kendo-panelbar-item-focus-gradient, + $kendo-panelbar-item-focus-shadow: $kendo-panelbar-item-focus-shadow, + $kendo-panelbar-item-hover-focus-bg: $kendo-panelbar-item-hover-focus-bg, + $kendo-panelbar-item-hover-focus-text: $kendo-panelbar-item-hover-focus-text, + $kendo-panelbar-item-hover-focus-border: $kendo-panelbar-item-hover-focus-border, + $kendo-panelbar-item-hover-focus-gradient: $kendo-panelbar-item-hover-focus-gradient, + $kendo-panelbar-item-selected-bg: $kendo-panelbar-item-selected-bg, + $kendo-panelbar-item-selected-text: $kendo-panelbar-item-selected-text, + $kendo-panelbar-item-selected-border: $kendo-panelbar-item-selected-border, + $kendo-panelbar-item-selected-gradient: $kendo-panelbar-item-selected-gradient, + $kendo-panelbar-item-selected-hover-bg: $kendo-panelbar-item-selected-hover-bg, + $kendo-panelbar-item-selected-hover-text: $kendo-panelbar-item-selected-hover-text, + $kendo-panelbar-item-selected-hover-border: $kendo-panelbar-item-selected-hover-border, + $kendo-panelbar-item-selected-hover-gradient: $kendo-panelbar-item-selected-hover-gradient, + $kendo-panelbar-item-selected-focus-bg: $kendo-panelbar-item-selected-focus-bg, + $kendo-panelbar-item-selected-focus-text: $kendo-panelbar-item-selected-focus-text, + $kendo-panelbar-item-selected-focus-border: $kendo-panelbar-item-selected-focus-border, + $kendo-panelbar-item-selected-focus-gradient: $kendo-panelbar-item-selected-focus-gradient, + $kendo-panelbar-item-selected-hover-focus-bg: $kendo-panelbar-item-selected-hover-focus-bg, + $kendo-panelbar-item-selected-hover-focus-text: $kendo-panelbar-item-selected-hover-focus-text, + $kendo-panelbar-item-selected-hover-focus-border: $kendo-panelbar-item-selected-hover-focus-border, + $kendo-panelbar-item-selected-hover-focus-gradient: $kendo-panelbar-item-selected-hover-focus-gradient, + $kendo-panelbar-header-expanded-bg: $kendo-panelbar-header-expanded-bg, + $kendo-panelbar-header-expanded-text: $kendo-panelbar-header-expanded-text, + $kendo-panelbar-header-expanded-border: $kendo-panelbar-header-expanded-border, + $kendo-panelbar-header-expanded-gradient: $kendo-panelbar-header-expanded-gradient +); diff --git a/packages/bootstrap/scss/pdf-viewer/_index.scss b/packages/bootstrap/scss/pdf-viewer/_index.scss index 20c93878e1b..00e5cbb25b3 100644 --- a/packages/bootstrap/scss/pdf-viewer/_index.scss +++ b/packages/bootstrap/scss/pdf-viewer/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -14,9 +15,18 @@ @use "../dropzone/_index.scss" as *; @use "../window/_index.scss" as *; + // Expose -@mixin pdf-viewer-styles() { +@mixin kendo-pdf-viewer--styles() { @include import-once( "pdf-viewer" ) { + @include core-styles(); + @include kendo-combobox--styles(); + @include kendo-toolbar--styles(); + @include kendo-dialog--styles(); + @include kendo-pager--styles(); + @include kendo-icon--styles(); + @include kendo-dropzone--styles(); + @include kendo-window--styles(); @include kendo-pdf-viewer--layout(); @include kendo-pdf-viewer--theme(); @include kendo-utils--layout--overflow(); diff --git a/packages/bootstrap/scss/pdf-viewer/_layout.scss b/packages/bootstrap/scss/pdf-viewer/_layout.scss index eadc138cac9..d786202eb90 100644 --- a/packages/bootstrap/scss/pdf-viewer/_layout.scss +++ b/packages/bootstrap/scss/pdf-viewer/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../button/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/pdf-viewer/_layout.scss"; +@use "@progress/kendo-theme-default/scss/pdf-viewer/_layout.scss" as *; @mixin kendo-pdf-viewer--layout() { diff --git a/packages/bootstrap/scss/pdf-viewer/_theme.scss b/packages/bootstrap/scss/pdf-viewer/_theme.scss index 56e15a09edf..98f4c3a8b29 100644 --- a/packages/bootstrap/scss/pdf-viewer/_theme.scss +++ b/packages/bootstrap/scss/pdf-viewer/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/pdf-viewer/_theme.scss"; +@use "@progress/kendo-theme-default/scss/pdf-viewer/_theme.scss" as *; @mixin kendo-pdf-viewer--theme() { diff --git a/packages/bootstrap/scss/pdf-viewer/_variables.scss b/packages/bootstrap/scss/pdf-viewer/_variables.scss index 9b30183ce11..7c197142d9f 100644 --- a/packages/bootstrap/scss/pdf-viewer/_variables.scss +++ b/packages/bootstrap/scss/pdf-viewer/_variables.scss @@ -1,6 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "../dropzone/_variables.scss" as *; @use "../toolbar/_variables.scss" as *; @use "../window/_variables.scss" as *; @@ -99,7 +99,7 @@ $kendo-pdf-viewer-search-panel-border: $kendo-component-border !default; $kendo-pdf-viewer-search-panel-shadow: null !default; /// The spacing of the matches container in the PDFViewer search panel. /// @group pdf-viewer -$kendo-pdf-viewer-search-panel-matches-spacing: $kendo-padding-sm-x !default; +$kendo-pdf-viewer-search-panel-matches-spacing: k-spacing(2) !default; /// The line height of the PDFViewer selection. /// @group pdf-viewer @@ -138,3 +138,47 @@ $kendo-pdf-viewer-free-text-annotation-placeholder-text: rgba(124, 22, 27, 0.5) /// The text color of the PDFViewer free text annotation. /// @group pdf-viewer $kendo-pdf-viewer-free-text-annotation-text: rgba(124, 22, 27, 0.7) !default; + + +@forward "@progress/kendo-theme-default/scss/pdf-viewer/_variables.scss" with ( + $kendo-pdf-viewer-border-width: $kendo-pdf-viewer-border-width, + $kendo-pdf-viewer-font-family: $kendo-pdf-viewer-font-family, + $kendo-pdf-viewer-font-size: $kendo-pdf-viewer-font-size, + $kendo-pdf-viewer-line-height: $kendo-pdf-viewer-line-height, + $kendo-pdf-viewer-bg: $kendo-pdf-viewer-bg, + $kendo-pdf-viewer-text: $kendo-pdf-viewer-text, + $kendo-pdf-viewer-border: $kendo-pdf-viewer-border, + $kendo-pdf-viewer-toolbar-bg: $kendo-pdf-viewer-toolbar-bg, + $kendo-pdf-viewer-toolbar-text: $kendo-pdf-viewer-toolbar-text, + $kendo-pdf-viewer-toolbar-border: $kendo-pdf-viewer-toolbar-border, + $kendo-pdf-viewer-toolbar-gradient: $kendo-pdf-viewer-toolbar-gradient, + $kendo-pdf-viewer-canvas-bg: $kendo-pdf-viewer-canvas-bg, + $kendo-pdf-viewer-canvas-text: $kendo-pdf-viewer-canvas-text, + $kendo-pdf-viewer-canvas-border: $kendo-pdf-viewer-canvas-border, + $kendo-pdf-viewer-page-spacing: $kendo-pdf-viewer-page-spacing, + $kendo-pdf-viewer-page-bg: $kendo-pdf-viewer-page-bg, + $kendo-pdf-viewer-page-text: $kendo-pdf-viewer-page-text, + $kendo-pdf-viewer-page-border: $kendo-pdf-viewer-page-border, + $kendo-pdf-viewer-page-shadow: $kendo-pdf-viewer-page-shadow, + $kendo-pdf-viewer-search-panel-padding-x: $kendo-pdf-viewer-search-panel-padding-x, + $kendo-pdf-viewer-search-panel-padding-y: $kendo-pdf-viewer-search-panel-padding-y, + $kendo-pdf-viewer-search-panel-spacing: $kendo-pdf-viewer-search-panel-spacing, + $kendo-pdf-viewer-search-panel-border-width: $kendo-pdf-viewer-search-panel-border-width, + $kendo-pdf-viewer-search-panel-border-radius: $kendo-pdf-viewer-search-panel-border-radius, + $kendo-pdf-viewer-search-panel-bg: $kendo-pdf-viewer-search-panel-bg, + $kendo-pdf-viewer-search-panel-text: $kendo-pdf-viewer-search-panel-text, + $kendo-pdf-viewer-search-panel-border: $kendo-pdf-viewer-search-panel-border, + $kendo-pdf-viewer-search-panel-shadow: $kendo-pdf-viewer-search-panel-shadow, + $kendo-pdf-viewer-search-panel-matches-spacing: $kendo-pdf-viewer-search-panel-matches-spacing, + $kendo-pdf-viewer-selection-line-height: $kendo-pdf-viewer-selection-line-height, + $kendo-pdf-viewer-search-highlight-bg: $kendo-pdf-viewer-search-highlight-bg, + $kendo-pdf-viewer-search-highlight-mark-bg: $kendo-pdf-viewer-search-highlight-mark-bg, + $kendo-pdf-viewer-icon-text: $kendo-pdf-viewer-icon-text, + $kendo-pdf-viewer-popup-padding-x: $kendo-pdf-viewer-popup-padding-x, + $kendo-pdf-viewer-popup-padding-y: $kendo-pdf-viewer-popup-padding-y, + $kendo-pdf-viewer-highlight-annotation-border: $kendo-pdf-viewer-highlight-annotation-border, + $kendo-pdf-viewer-highlight-annotation-hover-border: $kendo-pdf-viewer-highlight-annotation-hover-border, + $kendo-pdf-viewer-free-text-annotation-border: $kendo-pdf-viewer-free-text-annotation-border, + $kendo-pdf-viewer-free-text-annotation-placeholder-text: $kendo-pdf-viewer-free-text-annotation-placeholder-text, + $kendo-pdf-viewer-free-text-annotation-text: $kendo-pdf-viewer-free-text-annotation-text +); diff --git a/packages/bootstrap/scss/pivotgrid/_index.scss b/packages/bootstrap/scss/pivotgrid/_index.scss index a5acc04e241..abc0a7f6634 100644 --- a/packages/bootstrap/scss/pivotgrid/_index.scss +++ b/packages/bootstrap/scss/pivotgrid/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -12,9 +13,16 @@ @use "../icons/_index.scss" as *; @use "../list/_index.scss" as *; + // Expose -@mixin pivotgrid-styles() { +@mixin kendo-pivotgrid--styles() { @include import-once( "pivotgrid" ) { + @include core-styles(); + @include kendo-dialog--styles(); + @include kendo-treeview--styles(); + @include kendo-grid--styles(); + @include kendo-icon--styles(); + @include kendo-list--styles(); @include kendo-pivotgrid--layout(); @include kendo-pivotgrid--theme(); @include kendo-utils--layout--display(); diff --git a/packages/bootstrap/scss/pivotgrid/_layout.scss b/packages/bootstrap/scss/pivotgrid/_layout.scss index 7252660d1bd..9bc2d024ac1 100644 --- a/packages/bootstrap/scss/pivotgrid/_layout.scss +++ b/packages/bootstrap/scss/pivotgrid/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/pivotgrid/_layout.scss"; +@use "@progress/kendo-theme-default/scss/pivotgrid/_layout.scss" as *; @mixin kendo-pivotgrid--layout() { diff --git a/packages/bootstrap/scss/pivotgrid/_theme.scss b/packages/bootstrap/scss/pivotgrid/_theme.scss index 8ffa15e8a39..5c14f6c5ab8 100644 --- a/packages/bootstrap/scss/pivotgrid/_theme.scss +++ b/packages/bootstrap/scss/pivotgrid/_theme.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../popup/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/pivotgrid/_theme.scss"; +@use "@progress/kendo-theme-default/scss/pivotgrid/_theme.scss" as *; @mixin kendo-pivotgrid--theme() { diff --git a/packages/bootstrap/scss/pivotgrid/_variables.scss b/packages/bootstrap/scss/pivotgrid/_variables.scss index 8ca5e6f11d4..19536e82652 100644 --- a/packages/bootstrap/scss/pivotgrid/_variables.scss +++ b/packages/bootstrap/scss/pivotgrid/_variables.scss @@ -1,4 +1,7 @@ +@use "../core/_index.scss" as *; +@use "../grid/_variables.scss" as *; @use "../table/_variables.scss" as *; +@use "../list/_variables.scss" as *; // Pivot grid @@ -258,3 +261,91 @@ $kendo-pivotgrid-button-active-text: null !default; $kendo-pivotgrid-remove-bg: null !default; $kendo-pivotgrid-remove-text: null !default; + + +@forward "@progress/kendo-theme-default/scss/pivotgrid/_variables.scss" with ( + $kendo-pivotgrid-spacer: $kendo-pivotgrid-spacer, + $kendo-pivotgrid-padding-x: $kendo-pivotgrid-padding-x, + $kendo-pivotgrid-padding-y: $kendo-pivotgrid-padding-y, + $kendo-pivotgrid-font-family: $kendo-pivotgrid-font-family, + $kendo-pivotgrid-font-size: $kendo-pivotgrid-font-size, + $kendo-pivotgrid-line-height: $kendo-pivotgrid-line-height, + $kendo-pivotgrid-border-width: $kendo-pivotgrid-border-width, + $kendo-pivotgrid-icon-spacing: $kendo-pivotgrid-icon-spacing, + $kendo-pivotgrid-row-header-width: $kendo-pivotgrid-row-header-width, + $kendo-pivotgrid-column-header-height: $kendo-pivotgrid-column-header-height, + $kendo-pivotgrid-cell-padding-x: $kendo-pivotgrid-cell-padding-x, + $kendo-pivotgrid-cell-padding-y: $kendo-pivotgrid-cell-padding-y, + $kendo-pivotgrid-cell-border-width: $kendo-pivotgrid-cell-border-width, + $kendo-pivotgrid-bg: $kendo-pivotgrid-bg, + $kendo-pivotgrid-text: $kendo-pivotgrid-text, + $kendo-pivotgrid-border: $kendo-pivotgrid-border, + $kendo-pivotgrid-alt-border: $kendo-pivotgrid-alt-border, + $kendo-pivotgrid-headers-bg: $kendo-pivotgrid-headers-bg, + $kendo-pivotgrid-headers-text: $kendo-pivotgrid-headers-text, + $kendo-pivotgrid-headers-border: $kendo-pivotgrid-headers-border, + $kendo-pivotgrid-total-bg: $kendo-pivotgrid-total-bg, + $kendo-pivotgrid-total-text: $kendo-pivotgrid-total-text, + $kendo-pivotgrid-total-border: $kendo-pivotgrid-total-border, + $kendo-pivotgrid-hover-bg: $kendo-pivotgrid-hover-bg, + $kendo-pivotgrid-hover-text: $kendo-pivotgrid-hover-text, + $kendo-pivotgrid-hover-border: $kendo-pivotgrid-hover-border, + $kendo-pivotgrid-selected-bg: $kendo-pivotgrid-selected-bg, + $kendo-pivotgrid-selected-text: $kendo-pivotgrid-selected-text, + $kendo-pivotgrid-selected-border: $kendo-pivotgrid-selected-border, + $kendo-pivotgrid-focus-shadow: $kendo-pivotgrid-focus-shadow, + $kendo-pivotgrid-configurator-padding-x: $kendo-pivotgrid-configurator-padding-x, + $kendo-pivotgrid-configurator-padding-y: $kendo-pivotgrid-configurator-padding-y, + $kendo-pivotgrid-configurator-border-width: $kendo-pivotgrid-configurator-border-width, + $kendo-pivotgrid-configurator-header-padding-x: $kendo-pivotgrid-configurator-header-padding-x, + $kendo-pivotgrid-configurator-header-padding-y: $kendo-pivotgrid-configurator-header-padding-y, + $kendo-pivotgrid-configurator-header-font-size: $kendo-pivotgrid-configurator-header-font-size, + $kendo-pivotgrid-configurator-header-font-weight: $kendo-pivotgrid-configurator-header-font-weight, + $kendo-pivotgrid-configurator-content-padding-x: $kendo-pivotgrid-configurator-content-padding-x, + $kendo-pivotgrid-configurator-content-padding-y: $kendo-pivotgrid-configurator-content-padding-y, + $kendo-pivotgrid-configurator-fields-margin-x: $kendo-pivotgrid-configurator-fields-margin-x, + $kendo-pivotgrid-configurator-fields-margin-y: $kendo-pivotgrid-configurator-fields-margin-y, + $kendo-pivotgrid-configurator-vertical-width: $kendo-pivotgrid-configurator-vertical-width, + $kendo-pivotgrid-configurator-horizontal-height: $kendo-pivotgrid-configurator-horizontal-height, + $kendo-pivotgrid-configurator-bg: $kendo-pivotgrid-configurator-bg, + $kendo-pivotgrid-configurator-text: $kendo-pivotgrid-configurator-text, + $kendo-pivotgrid-configurator-border: $kendo-pivotgrid-configurator-border, + $kendo-pivotgrid-configurator-header-bg: $kendo-pivotgrid-configurator-header-bg, + $kendo-pivotgrid-configurator-header-text: $kendo-pivotgrid-configurator-header-text, + $kendo-pivotgrid-configurator-header-border: $kendo-pivotgrid-configurator-header-border, + $kendo-pivotgrid-configurator-shadow: $kendo-pivotgrid-configurator-shadow, + $kendo-pivotgrid-configurator-end-shadow: $kendo-pivotgrid-configurator-end-shadow, + $kendo-pivotgrid-configurator-start-shadow: $kendo-pivotgrid-configurator-start-shadow, + $kendo-pivotgrid-configurator-top-shadow: $kendo-pivotgrid-configurator-top-shadow, + $kendo-pivotgrid-configurator-bottom-shadow: $kendo-pivotgrid-configurator-bottom-shadow, + $kendo-pivotgrid-configurator-button-padding-x: $kendo-pivotgrid-configurator-button-padding-x, + $kendo-pivotgrid-configurator-button-padding-y: $kendo-pivotgrid-configurator-button-padding-y, + $kendo-pivotgrid-configurator-button-border-width: $kendo-pivotgrid-configurator-button-border-width, + $kendo-pivotgrid-configurator-button-size: $kendo-pivotgrid-configurator-button-size, + $kendo-pivotgrid-calculated-field-padding-x: $kendo-pivotgrid-calculated-field-padding-x, + $kendo-pivotgrid-calculated-field-padding-y: $kendo-pivotgrid-calculated-field-padding-y, + $kendo-pivotgrid-calculated-field-border-width: $kendo-pivotgrid-calculated-field-border-width, + $kendo-pivotgrid-calculated-field-border-radius: $kendo-pivotgrid-calculated-field-border-radius, + $kendo-pivotgrid-calculated-field-gap: $kendo-pivotgrid-calculated-field-gap, + $kendo-pivotgrid-calculated-field-bg: $kendo-pivotgrid-calculated-field-bg, + $kendo-pivotgrid-calculated-field-text: $kendo-pivotgrid-calculated-field-text, + $kendo-pivotgrid-calculated-field-border: $kendo-pivotgrid-calculated-field-border, + $kendo-pivotgrid-calculated-field-header-bg: $kendo-pivotgrid-calculated-field-header-bg, + $kendo-pivotgrid-calculated-field-header-text: $kendo-pivotgrid-calculated-field-header-text, + $kendo-pivotgrid-calculated-field-header-border: $kendo-pivotgrid-calculated-field-header-border, + $kendo-pivotgrid-treeview-padding-x: $kendo-pivotgrid-treeview-padding-x, + $kendo-pivotgrid-treeview-padding-y: $kendo-pivotgrid-treeview-padding-y, + $kendo-pivotgrid-alt-bg: $kendo-pivotgrid-alt-bg, + $kendo-pivotgrid-alt-text: $kendo-pivotgrid-alt-text, + $kendo-pivotgrid-chrome-border: $kendo-pivotgrid-chrome-border, + $kendo-pivotgrid-container-bg: $kendo-pivotgrid-container-bg, + $kendo-pivotgrid-row-headers-bg: $kendo-pivotgrid-row-headers-bg, + $kendo-pivotgrid-button-bg: $kendo-pivotgrid-button-bg, + $kendo-pivotgrid-button-text: $kendo-pivotgrid-button-text, + $kendo-pivotgrid-button-hover-bg: $kendo-pivotgrid-button-hover-bg, + $kendo-pivotgrid-button-hover-text: $kendo-pivotgrid-button-hover-text, + $kendo-pivotgrid-button-active-bg: $kendo-pivotgrid-button-active-bg, + $kendo-pivotgrid-button-active-text: $kendo-pivotgrid-button-active-text, + $kendo-pivotgrid-remove-bg: $kendo-pivotgrid-remove-bg, + $kendo-pivotgrid-remove-text: $kendo-pivotgrid-remove-text +); diff --git a/packages/bootstrap/scss/popover/_index.scss b/packages/bootstrap/scss/popover/_index.scss index fd5eb7399c7..ceefc823368 100644 --- a/packages/bootstrap/scss/popover/_index.scss +++ b/packages/bootstrap/scss/popover/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; -// @use "../card/_index.scss" as *; +@use "../card/_index.scss" as *; @use "../popup/_index.scss" as *; + // Expose -@mixin popover-styles() { +@mixin kendo-popover--styles() { @include import-once( "popover" ) { + @include core-styles(); + @include kendo-card--styles(); + @include kendo-popup--styles(); @include kendo-popover--layout(); @include kendo-popover--theme(); } diff --git a/packages/bootstrap/scss/popover/_layout.scss b/packages/bootstrap/scss/popover/_layout.scss index 32febeb5dac..05267e6794c 100644 --- a/packages/bootstrap/scss/popover/_layout.scss +++ b/packages/bootstrap/scss/popover/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/popover/_layout.scss"; +@use "@progress/kendo-theme-default/scss/popover/_layout.scss" as *; @mixin kendo-popover--layout() { diff --git a/packages/bootstrap/scss/popover/_theme.scss b/packages/bootstrap/scss/popover/_theme.scss index 18f782ea014..a802a9ea004 100644 --- a/packages/bootstrap/scss/popover/_theme.scss +++ b/packages/bootstrap/scss/popover/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/popover/_theme.scss"; +@use "@progress/kendo-theme-default/scss/popover/_theme.scss" as *; @mixin kendo-popover--theme() { diff --git a/packages/bootstrap/scss/popover/_variables.scss b/packages/bootstrap/scss/popover/_variables.scss index 08fda8a171b..a47c490ec07 100644 --- a/packages/bootstrap/scss/popover/_variables.scss +++ b/packages/bootstrap/scss/popover/_variables.scss @@ -88,3 +88,33 @@ $kendo-popover-callout-bg: $kendo-popover-bg !default; /// The border color of the Popover callout. /// @group popover $kendo-popover-callout-border: $kendo-popover-border !default; + + +@forward "@progress/kendo-theme-default/scss/popover/_variables.scss" with ( + $kendo-popover-border-width: $kendo-popover-border-width, + $kendo-popover-border-style: $kendo-popover-border-style, + $kendo-popover-border-radius: $kendo-popover-border-radius, + $kendo-popover-font-family: $kendo-popover-font-family, + $kendo-popover-font-size: $kendo-popover-font-size, + $kendo-popover-line-height: $kendo-popover-line-height, + $kendo-popover-text: $kendo-popover-text, + $kendo-popover-bg: $kendo-popover-bg, + $kendo-popover-border: $kendo-popover-border, + $kendo-popover-shadow: $kendo-popover-shadow, + $kendo-popover-header-padding-x: $kendo-popover-header-padding-x, + $kendo-popover-header-padding-y: $kendo-popover-header-padding-y, + $kendo-popover-header-border-width: $kendo-popover-header-border-width, + $kendo-popover-header-border-style: $kendo-popover-header-border-style, + $kendo-popover-header-text: $kendo-popover-header-text, + $kendo-popover-header-bg: $kendo-popover-header-bg, + $kendo-popover-header-border: $kendo-popover-header-border, + $kendo-popover-body-padding-x: $kendo-popover-body-padding-x, + $kendo-popover-body-padding-y: $kendo-popover-body-padding-y, + $kendo-popover-actions-border-width: $kendo-popover-actions-border-width, + $kendo-popover-callout-width: $kendo-popover-callout-width, + $kendo-popover-callout-height: $kendo-popover-callout-height, + $kendo-popover-callout-border-width: $kendo-popover-callout-border-width, + $kendo-popover-callout-border-style: $kendo-popover-callout-border-style, + $kendo-popover-callout-bg: $kendo-popover-callout-bg, + $kendo-popover-callout-border: $kendo-popover-callout-border +); diff --git a/packages/bootstrap/scss/popup/_index.scss b/packages/bootstrap/scss/popup/_index.scss index 6c6cc76d13c..e0807b63af7 100644 --- a/packages/bootstrap/scss/popup/_index.scss +++ b/packages/bootstrap/scss/popup/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin popup-styles() { +@mixin kendo-popup--styles() { @include import-once( "popup" ) { + @include core-styles(); @include kendo-popup--layout(); @include kendo-popup--theme(); } diff --git a/packages/bootstrap/scss/popup/_layout.scss b/packages/bootstrap/scss/popup/_layout.scss index 9f39f377cd6..8a57e4e347e 100644 --- a/packages/bootstrap/scss/popup/_layout.scss +++ b/packages/bootstrap/scss/popup/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/popup/_layout.scss"; +@use "@progress/kendo-theme-default/scss/popup/_layout.scss" as *; @mixin kendo-popup--layout() { diff --git a/packages/bootstrap/scss/popup/_theme.scss b/packages/bootstrap/scss/popup/_theme.scss index cebc28200ae..8ab0a768981 100644 --- a/packages/bootstrap/scss/popup/_theme.scss +++ b/packages/bootstrap/scss/popup/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/popup/_theme.scss"; +@use "@progress/kendo-theme-default/scss/popup/_theme.scss" as *; @mixin kendo-popup--theme() { diff --git a/packages/bootstrap/scss/popup/_variables.scss b/packages/bootstrap/scss/popup/_variables.scss index 3c0da7cbfde..26bc377a224 100644 --- a/packages/bootstrap/scss/popup/_variables.scss +++ b/packages/bootstrap/scss/popup/_variables.scss @@ -40,3 +40,19 @@ $kendo-popup-border: $kendo-component-border !default; /// Box shadow of the popup. /// @group popup $kendo-popup-shadow: k-elevation(4) !default; + + +@forward "@progress/kendo-theme-default/scss/popup/_variables.scss" with ( + $kendo-popup-padding-x: $kendo-popup-padding-x, + $kendo-popup-padding-y: $kendo-popup-padding-y, + $kendo-popup-border-width: $kendo-popup-border-width, + $kendo-popup-border-radius: $kendo-popup-border-radius, + $kendo-popup-font-size: $kendo-popup-font-size, + $kendo-popup-line-height: $kendo-popup-line-height, + $kendo-popup-content-padding-x: $kendo-popup-content-padding-x, + $kendo-popup-content-padding-y: $kendo-popup-content-padding-y, + $kendo-popup-bg: $kendo-popup-bg, + $kendo-popup-text: $kendo-popup-text, + $kendo-popup-border: $kendo-popup-border, + $kendo-popup-shadow: $kendo-popup-shadow +); diff --git a/packages/bootstrap/scss/progressbar/_index.scss b/packages/bootstrap/scss/progressbar/_index.scss index 9cdb5965f61..7e61ee1cc58 100644 --- a/packages/bootstrap/scss/progressbar/_index.scss +++ b/packages/bootstrap/scss/progressbar/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin progressbar-styles() { +@mixin kendo-progressbar--styles() { @include import-once( "progressbar" ) { + @include core-styles(); @include kendo-progressbar--layout(); @include kendo-progressbar--theme(); } diff --git a/packages/bootstrap/scss/progressbar/_layout.scss b/packages/bootstrap/scss/progressbar/_layout.scss index e60aefd2bd3..1ee5b6e2378 100644 --- a/packages/bootstrap/scss/progressbar/_layout.scss +++ b/packages/bootstrap/scss/progressbar/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/progressbar/_layout.scss"; +@use "@progress/kendo-theme-default/scss/progressbar/_layout.scss" as *; @mixin kendo-progressbar--layout() { diff --git a/packages/bootstrap/scss/progressbar/_theme.scss b/packages/bootstrap/scss/progressbar/_theme.scss index 2d9af1f0e2a..fdb2c720b29 100644 --- a/packages/bootstrap/scss/progressbar/_theme.scss +++ b/packages/bootstrap/scss/progressbar/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/progressbar/_theme.scss"; +@use "@progress/kendo-theme-default/scss/progressbar/_theme.scss" as *; @mixin kendo-progressbar--theme() { diff --git a/packages/bootstrap/scss/progressbar/_variables.scss b/packages/bootstrap/scss/progressbar/_variables.scss index 0e33d1c69be..b48dd13b6e3 100644 --- a/packages/bootstrap/scss/progressbar/_variables.scss +++ b/packages/bootstrap/scss/progressbar/_variables.scss @@ -1,5 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // ProgressBar @@ -75,3 +76,29 @@ $kendo-circular-progressbar-arc-stroke: $kendo-color-primary !default; /// The scale stroke background color of the circular ProgressBar. /// @group progressbar $kendo-circular-progressbar-scale-stroke: $kendo-progressbar-bg !default; + + +@forward "@progress/kendo-theme-default/scss/progressbar/_variables.scss" with ( + $kendo-progressbar-height: $kendo-progressbar-height, + $kendo-progressbar-horizontal-width: $kendo-progressbar-horizontal-width, + $kendo-progressbar-animation-timing: $kendo-progressbar-animation-timing, + $kendo-progressbar-border-width: $kendo-progressbar-border-width, + $kendo-progressbar-font-family: $kendo-progressbar-font-family, + $kendo-progressbar-font-size: $kendo-progressbar-font-size, + $kendo-progressbar-line-height: $kendo-progressbar-line-height, + $kendo-progressbar-bg: $kendo-progressbar-bg, + $kendo-progressbar-text: $kendo-progressbar-text, + $kendo-progressbar-border: $kendo-progressbar-border, + $kendo-progressbar-gradient: $kendo-progressbar-gradient, + $kendo-progressbar-value-bg: $kendo-progressbar-value-bg, + $kendo-progressbar-value-text: $kendo-progressbar-value-text, + $kendo-progressbar-value-border: $kendo-progressbar-value-border, + $kendo-progressbar-value-gradient: $kendo-progressbar-value-gradient, + $kendo-progressbar-indeterminate-bg: $kendo-progressbar-indeterminate-bg, + $kendo-progressbar-indeterminate-text: $kendo-progressbar-indeterminate-text, + $kendo-progressbar-indeterminate-border: $kendo-progressbar-indeterminate-border, + $kendo-progressbar-indeterminate-gradient: $kendo-progressbar-indeterminate-gradient, + $kendo-progressbar-chunk-border: $kendo-progressbar-chunk-border, + $kendo-circular-progressbar-arc-stroke: $kendo-circular-progressbar-arc-stroke, + $kendo-circular-progressbar-scale-stroke: $kendo-circular-progressbar-scale-stroke +); diff --git a/packages/bootstrap/scss/prompt/_index.scss b/packages/bootstrap/scss/prompt/_index.scss index b364d986203..1eaf42fdc48 100644 --- a/packages/bootstrap/scss/prompt/_index.scss +++ b/packages/bootstrap/scss/prompt/_index.scss @@ -3,13 +3,16 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; + // Expose -@mixin prompt-styles() { +@mixin kendo-prompt--styles() { @include import-once( "prompt" ) { + @include core-styles(); @include kendo-prompt--layout(); @include kendo-prompt--theme(); @include kendo-utils--flex-grid--flex-direction(); diff --git a/packages/bootstrap/scss/prompt/_layout.scss b/packages/bootstrap/scss/prompt/_layout.scss index d093a24167c..c28398f6710 100644 --- a/packages/bootstrap/scss/prompt/_layout.scss +++ b/packages/bootstrap/scss/prompt/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/prompt/_layout.scss"; +@use "@progress/kendo-theme-default/scss/prompt/_layout.scss" as *; @mixin kendo-prompt--layout() { diff --git a/packages/bootstrap/scss/prompt/_theme.scss b/packages/bootstrap/scss/prompt/_theme.scss index 2eb9d20a873..7ef635c6187 100644 --- a/packages/bootstrap/scss/prompt/_theme.scss +++ b/packages/bootstrap/scss/prompt/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/prompt/_theme.scss"; +@use "@progress/kendo-theme-default/scss/prompt/_theme.scss" as *; @mixin kendo-prompt--theme() { diff --git a/packages/bootstrap/scss/prompt/_variables.scss b/packages/bootstrap/scss/prompt/_variables.scss index cec3586bcd8..354b6e6b65d 100644 --- a/packages/bootstrap/scss/prompt/_variables.scss +++ b/packages/bootstrap/scss/prompt/_variables.scss @@ -67,3 +67,27 @@ $kendo-prompt-suggestion-border: $kendo-component-border !default; /// The elevation of the AIPrompt suggestion container. /// @group prompt $kendo-prompt-suggestion-shadow: k-elevation(1) !default; + + +@forward "@progress/kendo-theme-default/scss/prompt/_variables.scss" with ( + $kendo-prompt-text: $kendo-prompt-text, + $kendo-prompt-bg: $kendo-prompt-bg, + $kendo-prompt-border: $kendo-prompt-border, + $kendo-prompt-header-text: $kendo-prompt-header-text, + $kendo-prompt-header-bg: $kendo-prompt-header-bg, + $kendo-prompt-header-border: $kendo-prompt-header-border, + $kendo-prompt-content-padding-y: $kendo-prompt-content-padding-y, + $kendo-prompt-content-padding-x: $kendo-prompt-content-padding-x, + $kendo-prompt-content-spacing: $kendo-prompt-content-spacing, + $kendo-prompt-content-text: $kendo-prompt-content-text, + $kendo-prompt-content-bg: $kendo-prompt-content-bg, + $kendo-prompt-content-border: $kendo-prompt-content-border, + $kendo-prompt-expander-spacing: $kendo-prompt-expander-spacing, + $kendo-prompt-suggestion-padding-y: $kendo-prompt-suggestion-padding-y, + $kendo-prompt-suggestion-padding-x: $kendo-prompt-suggestion-padding-x, + $kendo-prompt-suggestion-border-radius: $kendo-prompt-suggestion-border-radius, + $kendo-prompt-suggestion-text: $kendo-prompt-suggestion-text, + $kendo-prompt-suggestion-bg: $kendo-prompt-suggestion-bg, + $kendo-prompt-suggestion-border: $kendo-prompt-suggestion-border, + $kendo-prompt-suggestion-shadow: $kendo-prompt-suggestion-shadow +); diff --git a/packages/bootstrap/scss/radio/_index.scss b/packages/bootstrap/scss/radio/_index.scss index 9d2977c7584..1b78dcf3a4b 100644 --- a/packages/bootstrap/scss/radio/_index.scss +++ b/packages/bootstrap/scss/radio/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin radio-styles() { +@mixin kendo-radio--styles() { @include import-once( "radio" ) { + @include core-styles(); @include kendo-radio--layout(); @include kendo-radio--theme(); } diff --git a/packages/bootstrap/scss/radio/_layout.scss b/packages/bootstrap/scss/radio/_layout.scss index 6284db0a693..717270b8292 100644 --- a/packages/bootstrap/scss/radio/_layout.scss +++ b/packages/bootstrap/scss/radio/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/radio/_layout.scss"; +@use "@progress/kendo-theme-default/scss/radio/_layout.scss" as *; @mixin kendo-radio--layout() { diff --git a/packages/bootstrap/scss/radio/_theme.scss b/packages/bootstrap/scss/radio/_theme.scss index 720394d541b..6403128e6e0 100644 --- a/packages/bootstrap/scss/radio/_theme.scss +++ b/packages/bootstrap/scss/radio/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/radio/_theme.scss"; +@use "@progress/kendo-theme-default/scss/radio/_theme.scss" as *; @mixin kendo-radio--theme() { diff --git a/packages/bootstrap/scss/radio/_variables.scss b/packages/bootstrap/scss/radio/_variables.scss index ba6c3716a34..c76644356ff 100644 --- a/packages/bootstrap/scss/radio/_variables.scss +++ b/packages/bootstrap/scss/radio/_variables.scss @@ -185,3 +185,52 @@ $kendo-radio-ripple-bg: $kendo-radio-checked-bg !default; /// The opacity of the RadioButton ripple. /// @group radio $kendo-radio-ripple-opacity: .25 !default; + + +@forward "@progress/kendo-theme-default/scss/radio/_variables.scss" with ( + $kendo-radio-radius: $kendo-radio-radius, + $kendo-radio-border-width: $kendo-radio-border-width, + $kendo-radio-sm-size: $kendo-radio-sm-size, + $kendo-radio-md-size: $kendo-radio-md-size, + $kendo-radio-lg-size: $kendo-radio-lg-size, + $kendo-radio-sm-glyph-size: $kendo-radio-sm-glyph-size, + $kendo-radio-md-glyph-size: $kendo-radio-md-glyph-size, + $kendo-radio-lg-glyph-size: $kendo-radio-lg-glyph-size, + $kendo-radio-sm-ripple-size: $kendo-radio-sm-ripple-size, + $kendo-radio-md-ripple-size: $kendo-radio-md-ripple-size, + $kendo-radio-lg-ripple-size: $kendo-radio-lg-ripple-size, + $kendo-radio-sizes: $kendo-radio-sizes, + $kendo-radio-bg: $kendo-radio-bg, + $kendo-radio-text: $kendo-radio-text, + $kendo-radio-border: $kendo-radio-border, + $kendo-radio-hover-bg: $kendo-radio-hover-bg, + $kendo-radio-hover-text: $kendo-radio-hover-text, + $kendo-radio-hover-border: $kendo-radio-hover-border, + $kendo-radio-checked-bg: $kendo-radio-checked-bg, + $kendo-radio-checked-text: $kendo-radio-checked-text, + $kendo-radio-checked-border: $kendo-radio-checked-border, + $kendo-radio-focus-border: $kendo-radio-focus-border, + $kendo-radio-focus-shadow: $kendo-radio-focus-shadow, + $kendo-radio-focus-checked-border: $kendo-radio-focus-checked-border, + $kendo-radio-focus-checked-shadow: $kendo-radio-focus-checked-shadow, + $kendo-radio-disabled-bg: $kendo-radio-disabled-bg, + $kendo-radio-disabled-text: $kendo-radio-disabled-text, + $kendo-radio-disabled-border: $kendo-radio-disabled-border, + $kendo-radio-disabled-checked-bg: $kendo-radio-disabled-checked-bg, + $kendo-radio-disabled-checked-text: $kendo-radio-disabled-checked-text, + $kendo-radio-disabled-checked-border: $kendo-radio-disabled-checked-border, + $kendo-radio-invalid-bg: $kendo-radio-invalid-bg, + $kendo-radio-invalid-text: $kendo-radio-invalid-text, + $kendo-radio-invalid-border: $kendo-radio-invalid-border, + $kendo-radio-indicator-type: $kendo-radio-indicator-type, + $kendo-radio-glyph-font-family: $kendo-radio-glyph-font-family, + $kendo-radio-checked-glyph: $kendo-radio-checked-glyph, + $kendo-radio-checked-image: $kendo-radio-checked-image, + $kendo-radio-disabled-checked-image: $kendo-radio-disabled-checked-image, + $kendo-radio-label-margin-x: $kendo-radio-label-margin-x, + $kendo-radio-list-spacing: $kendo-radio-list-spacing, + $kendo-radio-list-item-padding-x: $kendo-radio-list-item-padding-x, + $kendo-radio-list-item-padding-y: $kendo-radio-list-item-padding-y, + $kendo-radio-ripple-bg: $kendo-radio-ripple-bg, + $kendo-radio-ripple-opacity: $kendo-radio-ripple-opacity +); diff --git a/packages/bootstrap/scss/rating/_index.scss b/packages/bootstrap/scss/rating/_index.scss index 9471c0259a8..792d2075bbf 100644 --- a/packages/bootstrap/scss/rating/_index.scss +++ b/packages/bootstrap/scss/rating/_index.scss @@ -3,13 +3,17 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin rating-styles() { +@mixin kendo-rating--styles() { @include import-once( "rating" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-rating--layout(); @include kendo-rating--theme(); } diff --git a/packages/bootstrap/scss/rating/_layout.scss b/packages/bootstrap/scss/rating/_layout.scss index 88913cd070c..3f577cd2f7c 100644 --- a/packages/bootstrap/scss/rating/_layout.scss +++ b/packages/bootstrap/scss/rating/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/rating/_layout.scss"; +@use "@progress/kendo-theme-default/scss/rating/_layout.scss" as *; @mixin kendo-rating--layout() { diff --git a/packages/bootstrap/scss/rating/_theme.scss b/packages/bootstrap/scss/rating/_theme.scss index 5e6dd1f03bb..15df55314de 100644 --- a/packages/bootstrap/scss/rating/_theme.scss +++ b/packages/bootstrap/scss/rating/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/rating/_theme.scss"; +@use "@progress/kendo-theme-default/scss/rating/_theme.scss" as *; @mixin kendo-rating--theme() { diff --git a/packages/bootstrap/scss/rating/_variables.scss b/packages/bootstrap/scss/rating/_variables.scss index 8960868aab1..cc9fff8c4f8 100644 --- a/packages/bootstrap/scss/rating/_variables.scss +++ b/packages/bootstrap/scss/rating/_variables.scss @@ -1,6 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; // Rating @@ -16,21 +16,21 @@ $kendo-rating-line-height: var( --kendo-line-height, normal ) !default; /// The horizontal margin of the Rating container. /// @group rating -$kendo-rating-container-margin-x: $kendo-padding-sm-x !default; +$kendo-rating-container-margin-x: k-spacing(2) !default; /// The horizontal padding of the Rating item. /// @group rating -$kendo-rating-item-padding-x: $kendo-padding-sm-x !default; +$kendo-rating-item-padding-x: k-spacing(2) !default; /// The vertical padding of the Rating item. /// @group rating -$kendo-rating-item-padding-y: $kendo-padding-md-y !default; +$kendo-rating-item-padding-y: k-spacing(1) !default; /// The horizontal margin of the Rating label. /// @group rating -$kendo-rating-label-margin-x: $kendo-padding-md-x !default; +$kendo-rating-label-margin-x: k-spacing(4) !default; /// The vertical margin of the Rating label. /// @group rating -$kendo-rating-label-margin-y: $kendo-padding-md-y !default; +$kendo-rating-label-margin-y: k-spacing(1) !default; /// The line height of the Rating label. /// @group rating $kendo-rating-label-line-height: $kendo-line-height-lg !default; @@ -54,3 +54,22 @@ $kendo-rating-icon-focus-shadow: 0 2px 4px rgba( black, .1 ) !default; /// The shadow of the focused and selected Rating icon. /// @group rating $kendo-rating-icon-focus-selected-shadow: 0 2px 4px rgba( black, .1) !default; + + +@forward "@progress/kendo-theme-default/scss/rating/_variables.scss" with ( + $kendo-rating-font-family: $kendo-rating-font-family, + $kendo-rating-font-size: $kendo-rating-font-size, + $kendo-rating-line-height: $kendo-rating-line-height, + $kendo-rating-container-margin-x: $kendo-rating-container-margin-x, + $kendo-rating-item-padding-x: $kendo-rating-item-padding-x, + $kendo-rating-item-padding-y: $kendo-rating-item-padding-y, + $kendo-rating-label-margin-x: $kendo-rating-label-margin-x, + $kendo-rating-label-margin-y: $kendo-rating-label-margin-y, + $kendo-rating-label-line-height: $kendo-rating-label-line-height, + $kendo-rating-icon-text: $kendo-rating-icon-text, + $kendo-rating-icon-selected-text: $kendo-rating-icon-selected-text, + $kendo-rating-icon-hover-text: $kendo-rating-icon-hover-text, + $kendo-rating-icon-focus-text: $kendo-rating-icon-focus-text, + $kendo-rating-icon-focus-shadow: $kendo-rating-icon-focus-shadow, + $kendo-rating-icon-focus-selected-shadow: $kendo-rating-icon-focus-selected-shadow +); diff --git a/packages/bootstrap/scss/responsivepanel/_index.scss b/packages/bootstrap/scss/responsivepanel/_index.scss index 6b388a40b37..a071efcf0cc 100644 --- a/packages/bootstrap/scss/responsivepanel/_index.scss +++ b/packages/bootstrap/scss/responsivepanel/_index.scss @@ -3,14 +3,18 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin responsivepanel-styles() { - @include import-once( "responsivepanel" ) { - @include kendo-responsivepanel--layout(); - @include kendo-responsivepanel--theme(); +@mixin kendo-responsive-panel--styles() { + @include import-once( "responsive-panel" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-responsive-panel--layout(); + @include kendo-responsive-panel--theme(); } } diff --git a/packages/bootstrap/scss/responsivepanel/_layout.scss b/packages/bootstrap/scss/responsivepanel/_layout.scss index ab5628e6702..18166633b64 100644 --- a/packages/bootstrap/scss/responsivepanel/_layout.scss +++ b/packages/bootstrap/scss/responsivepanel/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/responsivepanel/_layout.scss"; +@use "@progress/kendo-theme-default/scss/responsivepanel/_layout.scss" as *; @mixin kendo-responsive-panel--layout() { diff --git a/packages/bootstrap/scss/responsivepanel/_theme.scss b/packages/bootstrap/scss/responsivepanel/_theme.scss index b64fd59bcce..29acbc480a6 100644 --- a/packages/bootstrap/scss/responsivepanel/_theme.scss +++ b/packages/bootstrap/scss/responsivepanel/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/responsivepanel/_theme.scss"; +@use "@progress/kendo-theme-default/scss/responsivepanel/_theme.scss" as *; @mixin kendo-responsive-panel--theme() { diff --git a/packages/bootstrap/scss/ripple/_index.scss b/packages/bootstrap/scss/ripple/_index.scss index 530f78fce2e..639abd53312 100644 --- a/packages/bootstrap/scss/ripple/_index.scss +++ b/packages/bootstrap/scss/ripple/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin ripple-styles() { +@mixin kendo-ripple--styles() { @include import-once( "ripple" ) { + @include core-styles(); @include kendo-ripple--layout(); @include kendo-ripple--theme(); } diff --git a/packages/bootstrap/scss/ripple/_layout.scss b/packages/bootstrap/scss/ripple/_layout.scss index a1e153e0973..683a4642378 100644 --- a/packages/bootstrap/scss/ripple/_layout.scss +++ b/packages/bootstrap/scss/ripple/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/ripple/_layout.scss"; +@use "@progress/kendo-theme-default/scss/ripple/_layout.scss" as *; @mixin kendo-ripple--layout() { diff --git a/packages/bootstrap/scss/ripple/_theme.scss b/packages/bootstrap/scss/ripple/_theme.scss index 67ac7cf8d55..188a394c350 100644 --- a/packages/bootstrap/scss/ripple/_theme.scss +++ b/packages/bootstrap/scss/ripple/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/ripple/_theme.scss"; +@use "@progress/kendo-theme-default/scss/ripple/_theme.scss" as *; @mixin kendo-ripple--theme() { diff --git a/packages/bootstrap/scss/scheduler/_index.scss b/packages/bootstrap/scss/scheduler/_index.scss index debf9d13990..02c41606665 100644 --- a/packages/bootstrap/scss/scheduler/_index.scss +++ b/packages/bootstrap/scss/scheduler/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -14,9 +15,18 @@ @use "../dialog/_index.scss" as *; @use "../tooltip/_index.scss" as *; + // Expose -@mixin scheduler-styles() { +@mixin kendo-scheduler--styles() { @include import-once( "scheduler" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-adaptive--styles(); + @include kendo-button--styles(); + @include kendo-date-time-picker--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-dialog--styles(); + @include kendo-tooltip--styles(); @include kendo-scheduler--layout(); @include kendo-scheduler--theme(); @include kendo-utils--typography--text-overflow(); diff --git a/packages/bootstrap/scss/scheduler/_layout.scss b/packages/bootstrap/scss/scheduler/_layout.scss index c25e85f6d9c..00ad58c0dd4 100644 --- a/packages/bootstrap/scss/scheduler/_layout.scss +++ b/packages/bootstrap/scss/scheduler/_layout.scss @@ -1,9 +1,9 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../toolbar/_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/scheduler/_layout.scss"; +@use "@progress/kendo-theme-default/scss/scheduler/_layout.scss" as *; @mixin kendo-scheduler--layout() { @@ -21,17 +21,17 @@ // Angular fix for stronger selector and smaller padding .k-event-template { & { // stylelint-disable-line - padding-block: $kendo-padding-sm-y; - padding-inline: $kendo-padding-sm-x; + padding-block: k-spacing(1); + padding-inline: k-spacing(2); font-size: var( --kendo-font-size-sm, inherit ); } } .k-event-actions { - right: $kendo-padding-sm-x; + right: k-spacing(2); &:first-child { - margin: .1ex .4ex 0 $kendo-padding-sm-x; + margin: .1ex .4ex 0 k-spacing(2); } } } diff --git a/packages/bootstrap/scss/scheduler/_theme.scss b/packages/bootstrap/scss/scheduler/_theme.scss index 6db02ec22a7..914f6f57d8a 100644 --- a/packages/bootstrap/scss/scheduler/_theme.scss +++ b/packages/bootstrap/scss/scheduler/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/scheduler/_theme.scss"; +@use "@progress/kendo-theme-default/scss/scheduler/_theme.scss" as *; @mixin kendo-scheduler--theme() { diff --git a/packages/bootstrap/scss/scheduler/_variables.scss b/packages/bootstrap/scss/scheduler/_variables.scss index d968db6b1cc..8ea8c45f875 100644 --- a/packages/bootstrap/scss/scheduler/_variables.scss +++ b/packages/bootstrap/scss/scheduler/_variables.scss @@ -1,6 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "../calendar/_variables.scss" as *; @use "../toolbar/_variables.scss" as *; @@ -63,7 +63,7 @@ $kendo-scheduler-event-min-height: 25px !default; $kendo-scheduler-event-border-radius: k-border-radius(md) !default; /// The line height of the Scheduler event. /// @group scheduler -$kendo-scheduler-event-line-height: calc( #{$kendo-scheduler-event-min-height} - (2 * #{$kendo-padding-sm-y}) ) !default; +$kendo-scheduler-event-line-height: calc( #{$kendo-scheduler-event-min-height} - (2 * #{k-spacing(1)}) ) !default; /// The background color of the Scheduler event. /// @group scheduler @@ -239,3 +239,78 @@ $kendo-scheduler-tooltip-event-gap: k-spacing(2) !default; /// The color of the Scheduler Tooltip callout. /// @group scheduler $kendo-scheduler-tooltip-callout-text: $kendo-scheduler-tooltip-bg !default; + + +@forward "@progress/kendo-theme-default/scss/scheduler/_variables.scss" with ( + $kendo-scheduler-border-width: $kendo-scheduler-border-width, + $kendo-scheduler-font-family: $kendo-scheduler-font-family, + $kendo-scheduler-font-size: $kendo-scheduler-font-size, + $kendo-scheduler-line-height: $kendo-scheduler-line-height, + $kendo-scheduler-bg: $kendo-scheduler-bg, + $kendo-scheduler-text: $kendo-scheduler-text, + $kendo-scheduler-border: $kendo-scheduler-border, + $kendo-scheduler-toolbar-bg: $kendo-scheduler-toolbar-bg, + $kendo-scheduler-toolbar-text: $kendo-scheduler-toolbar-text, + $kendo-scheduler-toolbar-border: $kendo-scheduler-toolbar-border, + $kendo-scheduler-toolbar-gradient: $kendo-scheduler-toolbar-gradient, + $kendo-scheduler-footer-bg: $kendo-scheduler-footer-bg, + $kendo-scheduler-footer-text: $kendo-scheduler-footer-text, + $kendo-scheduler-footer-border: $kendo-scheduler-footer-border, + $kendo-scheduler-footer-gradient: $kendo-scheduler-footer-gradient, + $kendo-scheduler-event-min-height: $kendo-scheduler-event-min-height, + $kendo-scheduler-event-border-radius: $kendo-scheduler-event-border-radius, + $kendo-scheduler-event-line-height: $kendo-scheduler-event-line-height, + $kendo-scheduler-event-bg: $kendo-scheduler-event-bg, + $kendo-scheduler-event-text: $kendo-scheduler-event-text, + $kendo-scheduler-event-border: $kendo-scheduler-event-border, + $kendo-scheduler-event-gradient: $kendo-scheduler-event-gradient, + $kendo-scheduler-event-shadow: $kendo-scheduler-event-shadow, + $kendo-scheduler-event-hover-bg: $kendo-scheduler-event-hover-bg, + $kendo-scheduler-event-hover-text: $kendo-scheduler-event-hover-text, + $kendo-scheduler-event-hover-border: $kendo-scheduler-event-hover-border, + $kendo-scheduler-event-hover-gradient: $kendo-scheduler-event-hover-gradient, + $kendo-scheduler-event-hover-shadow: $kendo-scheduler-event-hover-shadow, + $kendo-scheduler-event-selected-bg: $kendo-scheduler-event-selected-bg, + $kendo-scheduler-event-selected-text: $kendo-scheduler-event-selected-text, + $kendo-scheduler-event-selected-border: $kendo-scheduler-event-selected-border, + $kendo-scheduler-event-selected-gradient: $kendo-scheduler-event-selected-gradient, + $kendo-scheduler-event-selected-shadow: $kendo-scheduler-event-selected-shadow, + $kendo-scheduler-event-ongoing-shadow: $kendo-scheduler-event-ongoing-shadow, + $kendo-scheduler-cell-padding-x: $kendo-scheduler-cell-padding-x, + $kendo-scheduler-cell-padding-y: $kendo-scheduler-cell-padding-y, + $kendo-scheduler-cell-height: $kendo-scheduler-cell-height, + $kendo-scheduler-datecolumn-width: $kendo-scheduler-datecolumn-width, + $kendo-scheduler-timecolumn-width: $kendo-scheduler-timecolumn-width, + $kendo-scheduler-nonwork-bg: $kendo-scheduler-nonwork-bg, + $kendo-scheduler-nonwork-text: $kendo-scheduler-nonwork-text, + $kendo-scheduler-weekend-bg: $kendo-scheduler-weekend-bg, + $kendo-scheduler-weekend-text: $kendo-scheduler-weekend-text, + $kendo-scheduler-othermonth-bg: $kendo-scheduler-othermonth-bg, + $kendo-scheduler-othermonth-text: $kendo-scheduler-othermonth-text, + $kendo-scheduler-yearview-padding-x: $kendo-scheduler-yearview-padding-x, + $kendo-scheduler-yearview-padding-y: $kendo-scheduler-yearview-padding-y, + $kendo-scheduler-yearview-calendar-gap: $kendo-scheduler-yearview-calendar-gap, + $kendo-scheduler-yearview-indicator-size: $kendo-scheduler-yearview-indicator-size, + $kendo-scheduler-yearview-indicator-calc-offset-top: $kendo-scheduler-yearview-indicator-calc-offset-top, + $kendo-scheduler-yearview-indicator-calc-offset-left: $kendo-scheduler-yearview-indicator-calc-offset-left, + $kendo-scheduler-yearview-indicator-border-radius: $kendo-scheduler-yearview-indicator-border-radius, + $kendo-scheduler-yearview-indicator-bg: $kendo-scheduler-yearview-indicator-bg, + $kendo-scheduler-yearview-indicator-selected-bg: $kendo-scheduler-yearview-indicator-selected-bg, + $kendo-scheduler-tooltip-padding-x: $kendo-scheduler-tooltip-padding-x, + $kendo-scheduler-tooltip-padding-y: $kendo-scheduler-tooltip-padding-y, + $kendo-scheduler-tooltip-border-width: $kendo-scheduler-tooltip-border-width, + $kendo-scheduler-tooltip-bg: $kendo-scheduler-tooltip-bg, + $kendo-scheduler-tooltip-text: $kendo-scheduler-tooltip-text, + $kendo-scheduler-tooltip-border: $kendo-scheduler-tooltip-border, + $kendo-scheduler-tooltip-shadow: $kendo-scheduler-tooltip-shadow, + $kendo-scheduler-tooltip-title-margin-y: $kendo-scheduler-tooltip-title-margin-y, + $kendo-scheduler-tooltip-month-font-size: $kendo-scheduler-tooltip-month-font-size, + $kendo-scheduler-tooltip-day-font-size: $kendo-scheduler-tooltip-day-font-size, + $kendo-scheduler-tooltip-events-max-height: $kendo-scheduler-tooltip-events-max-height, + $kendo-scheduler-tooltip-events-gap: $kendo-scheduler-tooltip-events-gap, + $kendo-scheduler-tooltip-event-padding-x: $kendo-scheduler-tooltip-event-padding-x, + $kendo-scheduler-tooltip-event-padding-y: $kendo-scheduler-tooltip-event-padding-y, + $kendo-scheduler-tooltip-event-border-radius: $kendo-scheduler-tooltip-event-border-radius, + $kendo-scheduler-tooltip-event-gap: $kendo-scheduler-tooltip-event-gap, + $kendo-scheduler-tooltip-callout-text: $kendo-scheduler-tooltip-callout-text +); diff --git a/packages/bootstrap/scss/scroller/_index.scss b/packages/bootstrap/scss/scroller/_index.scss index 47e3601947d..d64a2b03b18 100644 --- a/packages/bootstrap/scss/scroller/_index.scss +++ b/packages/bootstrap/scss/scroller/_index.scss @@ -3,13 +3,17 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin scroller-styles() { +@mixin kendo-scroller--styles() { @include import-once( "scroller" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-scroller--layout(); @include kendo-scroller--theme(); } diff --git a/packages/bootstrap/scss/scroller/_layout.scss b/packages/bootstrap/scss/scroller/_layout.scss index 66def9ddd19..8c7d67a7217 100644 --- a/packages/bootstrap/scss/scroller/_layout.scss +++ b/packages/bootstrap/scss/scroller/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/scroller/_layout.scss"; +@use "@progress/kendo-theme-default/scss/scroller/_layout.scss" as *; @mixin kendo-scroller--layout() { diff --git a/packages/bootstrap/scss/scroller/_theme.scss b/packages/bootstrap/scss/scroller/_theme.scss index 58fc1f6ef6f..e7d3b1d565c 100644 --- a/packages/bootstrap/scss/scroller/_theme.scss +++ b/packages/bootstrap/scss/scroller/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/scroller/_theme.scss"; +@use "@progress/kendo-theme-default/scss/scroller/_theme.scss" as *; @mixin kendo-scroller--theme() { diff --git a/packages/bootstrap/scss/scrollview/_index.scss b/packages/bootstrap/scss/scrollview/_index.scss index 8da971ba4ad..070d62ce3b8 100644 --- a/packages/bootstrap/scss/scrollview/_index.scss +++ b/packages/bootstrap/scss/scrollview/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin scrollview-styles() { +@mixin kendo-scrollview--styles() { @include import-once( "scrollview" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-icon--styles(); @include kendo-scrollview--layout(); @include kendo-scrollview--theme(); } diff --git a/packages/bootstrap/scss/scrollview/_layout.scss b/packages/bootstrap/scss/scrollview/_layout.scss index c9af1763a77..dcc1ba99e38 100644 --- a/packages/bootstrap/scss/scrollview/_layout.scss +++ b/packages/bootstrap/scss/scrollview/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/scrollview/_layout.scss"; +@use "@progress/kendo-theme-default/scss/scrollview/_layout.scss" as *; @mixin kendo-scrollview--layout() { diff --git a/packages/bootstrap/scss/scrollview/_theme.scss b/packages/bootstrap/scss/scrollview/_theme.scss index d01a190b430..49a581cf374 100644 --- a/packages/bootstrap/scss/scrollview/_theme.scss +++ b/packages/bootstrap/scss/scrollview/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/scrollview/_theme.scss"; +@use "@progress/kendo-theme-default/scss/scrollview/_theme.scss" as *; @mixin kendo-scrollview--theme() { diff --git a/packages/bootstrap/scss/scrollview/_variables.scss b/packages/bootstrap/scss/scrollview/_variables.scss index e4cd1d9e889..7732a2dc62f 100644 --- a/packages/bootstrap/scss/scrollview/_variables.scss +++ b/packages/bootstrap/scss/scrollview/_variables.scss @@ -94,3 +94,35 @@ $kendo-scrollview-transition-duration: .3s !default; /// The timing function of the ScrollView transition. /// @group scrollview $kendo-scrollview-transition-timing-function: ease-in-out !default; + + +@forward "@progress/kendo-theme-default/scss/scrollview/_variables.scss" with ( + $kendo-scrollview-border-width: $kendo-scrollview-border-width, + $kendo-scrollview-font-family: $kendo-scrollview-font-family, + $kendo-scrollview-font-size: $kendo-scrollview-font-size, + $kendo-scrollview-line-height: $kendo-scrollview-line-height, + $kendo-scrollview-text: $kendo-scrollview-text, + $kendo-scrollview-bg: $kendo-scrollview-bg, + $kendo-scrollview-border: $kendo-scrollview-border, + $kendo-scrollview-pagebutton-size: $kendo-scrollview-pagebutton-size, + $kendo-scrollview-pagebutton-bg: $kendo-scrollview-pagebutton-bg, + $kendo-scrollview-pagebutton-border: $kendo-scrollview-pagebutton-border, + $kendo-scrollview-pagebutton-primary-bg: $kendo-scrollview-pagebutton-primary-bg, + $kendo-scrollview-pagebutton-primary-border: $kendo-scrollview-pagebutton-primary-border, + $kendo-scrollview-pagebutton-shadow: $kendo-scrollview-pagebutton-shadow, + $kendo-scrollview-pager-offset: $kendo-scrollview-pager-offset, + $kendo-scrollview-pager-item-spacing: $kendo-scrollview-pager-item-spacing, + $kendo-scrollview-pager-item-border-width: $kendo-scrollview-pager-item-border-width, + $kendo-scrollview-pager-height: $kendo-scrollview-pager-height, + $kendo-scrollview-arrow-tap-highlight-color: $kendo-scrollview-arrow-tap-highlight-color, + $kendo-scrollview-navigation-color: $kendo-scrollview-navigation-color, + $kendo-scrollview-navigation-icon-shadow: $kendo-scrollview-navigation-icon-shadow, + $kendo-scrollview-navigation-bg: $kendo-scrollview-navigation-bg, + $kendo-scrollview-navigation-default-opacity: $kendo-scrollview-navigation-default-opacity, + $kendo-scrollview-navigation-hover-opacity: $kendo-scrollview-navigation-hover-opacity, + $kendo-scrollview-navigation-hover-span-bg: $kendo-scrollview-navigation-hover-span-bg, + $kendo-scrollview-light-bg: $kendo-scrollview-light-bg, + $kendo-scrollview-dark-bg: $kendo-scrollview-dark-bg, + $kendo-scrollview-transition-duration: $kendo-scrollview-transition-duration, + $kendo-scrollview-transition-timing-function: $kendo-scrollview-transition-timing-function +); diff --git a/packages/bootstrap/scss/searchbox/_index.scss b/packages/bootstrap/scss/searchbox/_index.scss index 8bad9b3dd2d..2cecad0af60 100644 --- a/packages/bootstrap/scss/searchbox/_index.scss +++ b/packages/bootstrap/scss/searchbox/_index.scss @@ -3,15 +3,21 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; @use "../button/_index.scss" as *; @use "../input/_index.scss" as *; + // Expose -@mixin searchbox-styles() { +@mixin kendo-searchbox--styles() { @include import-once( "searchbox" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-button--styles(); + @include kendo-input--styles(); @include kendo-searchbox--layout(); @include kendo-searchbox--theme(); } diff --git a/packages/bootstrap/scss/searchbox/_layout.scss b/packages/bootstrap/scss/searchbox/_layout.scss index 723e110c6ed..42f729d6f48 100644 --- a/packages/bootstrap/scss/searchbox/_layout.scss +++ b/packages/bootstrap/scss/searchbox/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/searchbox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/searchbox/_layout.scss" as *; @mixin kendo-searchbox--layout() { diff --git a/packages/bootstrap/scss/searchbox/_theme.scss b/packages/bootstrap/scss/searchbox/_theme.scss index 0f27ae4ae98..5fe79da30bf 100644 --- a/packages/bootstrap/scss/searchbox/_theme.scss +++ b/packages/bootstrap/scss/searchbox/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/searchbox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/searchbox/_theme.scss" as *; @mixin kendo-searchbox--theme() { diff --git a/packages/bootstrap/scss/signature/_index.scss b/packages/bootstrap/scss/signature/_index.scss index f60dafd7434..235b859f45a 100644 --- a/packages/bootstrap/scss/signature/_index.scss +++ b/packages/bootstrap/scss/signature/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @use "../input/_index.scss" as *; + // Expose -@mixin signature-styles() { +@mixin kendo-signature--styles() { @include import-once( "signature" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-input--styles(); @include kendo-signature--layout(); @include kendo-signature--theme(); } diff --git a/packages/bootstrap/scss/signature/_layout.scss b/packages/bootstrap/scss/signature/_layout.scss index 297c733d500..1268e9b9d4d 100644 --- a/packages/bootstrap/scss/signature/_layout.scss +++ b/packages/bootstrap/scss/signature/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/signature/_layout.scss"; +@use "@progress/kendo-theme-default/scss/signature/_layout.scss" as *; @mixin kendo-signature--layout() { diff --git a/packages/bootstrap/scss/signature/_theme.scss b/packages/bootstrap/scss/signature/_theme.scss index 18999824366..3f481a86e83 100644 --- a/packages/bootstrap/scss/signature/_theme.scss +++ b/packages/bootstrap/scss/signature/_theme.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/signature/_theme.scss"; +@use "@progress/kendo-theme-default/scss/signature/_theme.scss" as *; @mixin kendo-signature--theme() { diff --git a/packages/bootstrap/scss/signature/_variables.scss b/packages/bootstrap/scss/signature/_variables.scss index aa9c18a6077..84cc64d5567 100644 --- a/packages/bootstrap/scss/signature/_variables.scss +++ b/packages/bootstrap/scss/signature/_variables.scss @@ -52,3 +52,31 @@ $kendo-signature-sizes: ( $kendo-signature-actions-gap: k-spacing(1) !default; $kendo-signature-maximized-line-width: 3px !default; + + +@forward "@progress/kendo-theme-default/scss/signature/_variables.scss" with ( + $kendo-signature-width: $kendo-signature-width, + $kendo-signature-height: $kendo-signature-height, + $kendo-signature-lg-min-height: $kendo-signature-lg-min-height, + $kendo-signature-maximized-width: $kendo-signature-maximized-width, + $kendo-signature-maximized-height: $kendo-signature-maximized-height, + $kendo-signature-padding-x: $kendo-signature-padding-x, + $kendo-signature-sm-padding-x: $kendo-signature-sm-padding-x, + $kendo-signature-md-padding-x: $kendo-signature-md-padding-x, + $kendo-signature-lg-padding-x: $kendo-signature-lg-padding-x, + $kendo-signature-padding-y: $kendo-signature-padding-y, + $kendo-signature-sm-padding-y: $kendo-signature-sm-padding-y, + $kendo-signature-md-padding-y: $kendo-signature-md-padding-y, + $kendo-signature-lg-padding-y: $kendo-signature-lg-padding-y, + $kendo-signature-line-width: $kendo-signature-line-width, + $kendo-signature-line-style: $kendo-signature-line-style, + $kendo-signature-line-color: $kendo-signature-line-color, + $kendo-signature-line-size: $kendo-signature-line-size, + $kendo-signature-sm-line-size: $kendo-signature-sm-line-size, + $kendo-signature-md-line-size: $kendo-signature-md-line-size, + $kendo-signature-lg-line-size: $kendo-signature-lg-line-size, + $kendo-signature-line-bottom-offset: $kendo-signature-line-bottom-offset, + $kendo-signature-sizes: $kendo-signature-sizes, + $kendo-signature-actions-gap: $kendo-signature-actions-gap, + $kendo-signature-maximized-line-width: $kendo-signature-maximized-line-width +); diff --git a/packages/bootstrap/scss/skeleton/_index.scss b/packages/bootstrap/scss/skeleton/_index.scss index b40778f6b63..03b44239494 100644 --- a/packages/bootstrap/scss/skeleton/_index.scss +++ b/packages/bootstrap/scss/skeleton/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin skeleton-styles() { +@mixin kendo-skeleton--styles() { @include import-once( "skeleton" ) { + @include core-styles(); @include kendo-skeleton--layout(); @include kendo-skeleton--theme(); } diff --git a/packages/bootstrap/scss/skeleton/_layout.scss b/packages/bootstrap/scss/skeleton/_layout.scss index e735175871f..fb889222621 100644 --- a/packages/bootstrap/scss/skeleton/_layout.scss +++ b/packages/bootstrap/scss/skeleton/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/skeleton/_layout.scss"; +@use "@progress/kendo-theme-default/scss/skeleton/_layout.scss" as *; @mixin kendo-skeleton--layout() { diff --git a/packages/bootstrap/scss/skeleton/_theme.scss b/packages/bootstrap/scss/skeleton/_theme.scss index 68a438aba9c..0131dd2c999 100644 --- a/packages/bootstrap/scss/skeleton/_theme.scss +++ b/packages/bootstrap/scss/skeleton/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/skeleton/_theme.scss"; +@use "@progress/kendo-theme-default/scss/skeleton/_theme.scss" as *; @mixin kendo-skeleton--theme() { diff --git a/packages/bootstrap/scss/skeleton/_variables.scss b/packages/bootstrap/scss/skeleton/_variables.scss index dae17136008..8fc1d65f8ae 100644 --- a/packages/bootstrap/scss/skeleton/_variables.scss +++ b/packages/bootstrap/scss/skeleton/_variables.scss @@ -24,3 +24,13 @@ $kendo-skeleton-item-bg: if($kendo-enable-color-system, color-mix(in srgb, k-col /// The background color of the Skeleton wave animation. /// @group skeleton $kendo-skeleton-wave-bg: rgba( black, .04 ) !default; + + +@forward "@progress/kendo-theme-default/scss/skeleton/_variables.scss" with ( + $kendo-skeleton-text-transform: $kendo-skeleton-text-transform, + $kendo-skeleton-text-border-radius: $kendo-skeleton-text-border-radius, + $kendo-skeleton-rect-border-radius: $kendo-skeleton-rect-border-radius, + $kendo-skeleton-circle-border-radius: $kendo-skeleton-circle-border-radius, + $kendo-skeleton-item-bg: $kendo-skeleton-item-bg, + $kendo-skeleton-wave-bg: $kendo-skeleton-wave-bg +); diff --git a/packages/bootstrap/scss/slider/_index.scss b/packages/bootstrap/scss/slider/_index.scss index cbadd082a64..0a5a175785e 100644 --- a/packages/bootstrap/scss/slider/_index.scss +++ b/packages/bootstrap/scss/slider/_index.scss @@ -3,15 +3,21 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @use "../tooltip/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin slider-styles() { +@mixin kendo-slider--styles() { @include import-once( "slider" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-tooltip--styles(); + @include kendo-icon--styles(); @include kendo-slider--layout(); @include kendo-slider--theme(); } diff --git a/packages/bootstrap/scss/slider/_layout.scss b/packages/bootstrap/scss/slider/_layout.scss index 0f58a2781a2..f0f7fe56908 100644 --- a/packages/bootstrap/scss/slider/_layout.scss +++ b/packages/bootstrap/scss/slider/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../tooltip/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/slider/_layout.scss"; +@use "@progress/kendo-theme-default/scss/slider/_layout.scss" as *; @mixin kendo-slider--layout() { diff --git a/packages/bootstrap/scss/slider/_theme.scss b/packages/bootstrap/scss/slider/_theme.scss index cbada5aead5..685ee4892e8 100644 --- a/packages/bootstrap/scss/slider/_theme.scss +++ b/packages/bootstrap/scss/slider/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/slider/_theme.scss"; +@use "@progress/kendo-theme-default/scss/slider/_theme.scss" as *; @mixin kendo-slider--theme() { diff --git a/packages/bootstrap/scss/slider/_variables.scss b/packages/bootstrap/scss/slider/_variables.scss index ee0f0ba204e..f7c443f21e1 100644 --- a/packages/bootstrap/scss/slider/_variables.scss +++ b/packages/bootstrap/scss/slider/_variables.scss @@ -1,5 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; +@use "../button/_variables.scss" as *; // Slider /// The default size of the Slider. @@ -123,3 +124,44 @@ $kendo-slider-tick-horizontal-image: "data:image/gif;base64,R0lGODlhAQC0AIABALi4 /// The background image of the vertical Slider tick. /// @group slider $kendo-slider-tick-vertical-image: "data:image/gif;base64,R0lGODlhtAABAIABALi4uAAAACH5BAEAAAEALAAAAAC0AAEAAAIWjIGJxqzazlux2ovlzND2rAHgSIZWAQA7" !default; + + +@forward "@progress/kendo-theme-default/scss/slider/_variables.scss" with ( + $kendo-slider-size: $kendo-slider-size, + $kendo-slider-tick-size: $kendo-slider-tick-size, + $kendo-slider-alt-size: $kendo-slider-alt-size, + $kendo-slider-font-family: $kendo-slider-font-family, + $kendo-slider-font-size: $kendo-slider-font-size, + $kendo-slider-line-height: $kendo-slider-line-height, + $kendo-slider-button-offset: $kendo-slider-button-offset, + $kendo-slider-button-size: $kendo-slider-button-size, + $kendo-slider-button-spacing: $kendo-slider-button-spacing, + $kendo-slider-button-focus-shadow: $kendo-slider-button-focus-shadow, + $kendo-slider-track-thickness: $kendo-slider-track-thickness, + $kendo-slider-draghandle-size: $kendo-slider-draghandle-size, + $kendo-slider-draghandle-border-width: $kendo-slider-draghandle-border-width, + $kendo-slider-draghandle-active-scale: $kendo-slider-draghandle-active-scale, + $kendo-slider-draghandle-active-size: $kendo-slider-draghandle-active-size, + $kendo-slider-draghandle-bg: $kendo-slider-draghandle-bg, + $kendo-slider-draghandle-text: $kendo-slider-draghandle-text, + $kendo-slider-draghandle-border: $kendo-slider-draghandle-border, + $kendo-slider-draghandle-gradient: $kendo-slider-draghandle-gradient, + $kendo-slider-draghandle-hover-bg: $kendo-slider-draghandle-hover-bg, + $kendo-slider-draghandle-hover-text: $kendo-slider-draghandle-hover-text, + $kendo-slider-draghandle-hover-border: $kendo-slider-draghandle-hover-border, + $kendo-slider-draghandle-hover-gradient: $kendo-slider-draghandle-hover-gradient, + $kendo-slider-draghandle-pressed-bg: $kendo-slider-draghandle-pressed-bg, + $kendo-slider-draghandle-pressed-text: $kendo-slider-draghandle-pressed-text, + $kendo-slider-draghandle-pressed-border: $kendo-slider-draghandle-pressed-border, + $kendo-slider-draghandle-pressed-gradient: $kendo-slider-draghandle-pressed-gradient, + $kendo-slider-draghandle-focus-shadow: $kendo-slider-draghandle-focus-shadow, + $kendo-slider-transition-speed: $kendo-slider-transition-speed, + $kendo-slider-transition-function: $kendo-slider-transition-function, + $kendo-slider-draghandle-transition-speed: $kendo-slider-draghandle-transition-speed, + $kendo-slider-draghandle-transition-function: $kendo-slider-draghandle-transition-function, + $kendo-slider-track-bg: $kendo-slider-track-bg, + $kendo-slider-selection-bg: $kendo-slider-selection-bg, + $kendo-slider-disabled-opacity: $kendo-slider-disabled-opacity, + $kendo-slider-tick-horizontal-image: $kendo-slider-tick-horizontal-image, + $kendo-slider-tick-vertical-image: $kendo-slider-tick-vertical-image +); diff --git a/packages/bootstrap/scss/split-button/_index.scss b/packages/bootstrap/scss/split-button/_index.scss index 3cf9d8a6088..2f810291fe1 100644 --- a/packages/bootstrap/scss/split-button/_index.scss +++ b/packages/bootstrap/scss/split-button/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @use "../menu/_index.scss" as *; + // Expose -@mixin split-button-styles() { +@mixin kendo-split-button--styles() { @include import-once( "split-button" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-menu--styles(); @include kendo-split-button--layout(); @include kendo-split-button--theme(); } diff --git a/packages/bootstrap/scss/split-button/_layout.scss b/packages/bootstrap/scss/split-button/_layout.scss index 70796c19658..d1b2aed58f0 100644 --- a/packages/bootstrap/scss/split-button/_layout.scss +++ b/packages/bootstrap/scss/split-button/_layout.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/split-button/_layout.scss"; +@use "@progress/kendo-theme-default/scss/split-button/_layout.scss" as *; @mixin kendo-split-button--layout() { diff --git a/packages/bootstrap/scss/split-button/_theme.scss b/packages/bootstrap/scss/split-button/_theme.scss index 7a7ac688f1d..e399d26b3f2 100644 --- a/packages/bootstrap/scss/split-button/_theme.scss +++ b/packages/bootstrap/scss/split-button/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/split-button/_theme.scss"; +@use "@progress/kendo-theme-default/scss/split-button/_theme.scss" as *; @mixin kendo-split-button--theme() { diff --git a/packages/bootstrap/scss/split-button/_variables.scss b/packages/bootstrap/scss/split-button/_variables.scss index 080ada3bba9..8ff9fedc9c9 100644 --- a/packages/bootstrap/scss/split-button/_variables.scss +++ b/packages/bootstrap/scss/split-button/_variables.scss @@ -33,3 +33,16 @@ $kendo-split-button-md-arrow-padding-y: $kendo-button-md-padding-y !default; /// The vertical padding of the large arrow Button. /// @group split-button $kendo-split-button-lg-arrow-padding-y: $kendo-button-lg-padding-y !default; + + +@forward "@progress/kendo-theme-default/scss/split-button/_variables.scss" with ( + $kendo-split-button-focus-shadow: $kendo-split-button-focus-shadow, + $kendo-split-button-arrow-padding-x: $kendo-split-button-arrow-padding-x, + $kendo-split-button-sm-arrow-padding-x: $kendo-split-button-sm-arrow-padding-x, + $kendo-split-button-md-arrow-padding-x: $kendo-split-button-md-arrow-padding-x, + $kendo-split-button-lg-arrow-padding-x: $kendo-split-button-lg-arrow-padding-x, + $kendo-split-button-arrow-padding-y: $kendo-split-button-arrow-padding-y, + $kendo-split-button-sm-arrow-padding-y: $kendo-split-button-sm-arrow-padding-y, + $kendo-split-button-md-arrow-padding-y: $kendo-split-button-md-arrow-padding-y, + $kendo-split-button-lg-arrow-padding-y: $kendo-split-button-lg-arrow-padding-y +); diff --git a/packages/bootstrap/scss/splitter/_index.scss b/packages/bootstrap/scss/splitter/_index.scss index b7a0e42f8f8..b1b0f96b034 100644 --- a/packages/bootstrap/scss/splitter/_index.scss +++ b/packages/bootstrap/scss/splitter/_index.scss @@ -3,13 +3,17 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin splitter-styles() { +@mixin kendo-splitter--styles() { @include import-once( "splitter" ) { + @include core-styles(); + @include kendo-icon--styles(); @include kendo-splitter--layout(); @include kendo-splitter--theme(); } diff --git a/packages/bootstrap/scss/splitter/_layout.scss b/packages/bootstrap/scss/splitter/_layout.scss index be0233f50fd..a0884ddee83 100644 --- a/packages/bootstrap/scss/splitter/_layout.scss +++ b/packages/bootstrap/scss/splitter/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/splitter/_layout.scss"; +@use "@progress/kendo-theme-default/scss/splitter/_layout.scss" as *; @mixin kendo-splitter--layout() { diff --git a/packages/bootstrap/scss/splitter/_theme.scss b/packages/bootstrap/scss/splitter/_theme.scss index 77a8bf5c662..d46fa74881b 100644 --- a/packages/bootstrap/scss/splitter/_theme.scss +++ b/packages/bootstrap/scss/splitter/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/splitter/_theme.scss"; +@use "@progress/kendo-theme-default/scss/splitter/_theme.scss" as *; @mixin kendo-splitter--theme() { diff --git a/packages/bootstrap/scss/splitter/_variables.scss b/packages/bootstrap/scss/splitter/_variables.scss index d65b083f023..b3defec49cb 100644 --- a/packages/bootstrap/scss/splitter/_variables.scss +++ b/packages/bootstrap/scss/splitter/_variables.scss @@ -65,3 +65,26 @@ $kendo-splitbar-selected-bg: $kendo-selected-bg !default; /// The selected text color of the Splitter split bar. /// @group splitter $kendo-splitbar-selected-text: $kendo-selected-text !default; + + +@forward "@progress/kendo-theme-default/scss/splitter/_variables.scss" with ( + $kendo-splitter-border-width: $kendo-splitter-border-width, + $kendo-splitter-font-family: $kendo-splitter-font-family, + $kendo-splitter-font-size: $kendo-splitter-font-size, + $kendo-splitter-line-height: $kendo-splitter-line-height, + $kendo-splitter-bg: $kendo-splitter-bg, + $kendo-splitter-text: $kendo-splitter-text, + $kendo-splitter-border: $kendo-splitter-border, + $kendo-splitter-splitbar-size: $kendo-splitter-splitbar-size, + $kendo-splitter-drag-handle-length: $kendo-splitter-drag-handle-length, + $kendo-splitter-drag-handle-thickness: $kendo-splitter-drag-handle-thickness, + $kendo-splitter-drag-icon-margin: $kendo-splitter-drag-icon-margin, + $kendo-splitter-collapse-icon-padding-x: $kendo-splitter-collapse-icon-padding-x, + $kendo-splitter-collapse-icon-padding-y: $kendo-splitter-collapse-icon-padding-y, + $kendo-splitbar-bg: $kendo-splitbar-bg, + $kendo-splitbar-text: $kendo-splitbar-text, + $kendo-splitbar-hover-bg: $kendo-splitbar-hover-bg, + $kendo-splitbar-hover-text: $kendo-splitbar-hover-text, + $kendo-splitbar-selected-bg: $kendo-splitbar-selected-bg, + $kendo-splitbar-selected-text: $kendo-splitbar-selected-text +); diff --git a/packages/bootstrap/scss/spreadsheet/_index.scss b/packages/bootstrap/scss/spreadsheet/_index.scss index 00047f458b7..3b4ff344052 100644 --- a/packages/bootstrap/scss/spreadsheet/_index.scss +++ b/packages/bootstrap/scss/spreadsheet/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -22,9 +23,26 @@ @use "../icons/_index.scss" as *; @use "../list/_index.scss" as *; + // Expose -@mixin spreadsheet-styles() { +@mixin kendo-spreadsheet--styles() { @include import-once( "spreadsheet" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-checkbox--styles(); + @include kendo-radio--styles(); + @include kendo-color-picker--styles(); + @include kendo-combobox--styles(); + @include kendo-date-time-picker--styles(); + @include kendo-dropdown-list--styles(); + @include kendo-toolbar--styles(); + @include kendo-upload--styles(); + @include kendo-menu--styles(); + @include kendo-window--styles(); + @include kendo-tabstrip--styles(); + @include kendo-treeview--styles(); + @include kendo-icon--styles(); + @include kendo-list--styles(); @include kendo-spreadsheet--layout(); @include kendo-spreadsheet--theme(); @include kendo-utils--flex-grid--order(); diff --git a/packages/bootstrap/scss/spreadsheet/_layout.scss b/packages/bootstrap/scss/spreadsheet/_layout.scss index 1255763a887..a32167f4446 100644 --- a/packages/bootstrap/scss/spreadsheet/_layout.scss +++ b/packages/bootstrap/scss/spreadsheet/_layout.scss @@ -1,10 +1,11 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; @use "../list/_variables.scss" as *; @use "../menu/_variables.scss" as *; @use "../toolbar/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/spreadsheet/_layout.scss"; +@use "@progress/kendo-theme-default/scss/spreadsheet/_layout.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; @mixin kendo-spreadsheet--layout() { diff --git a/packages/bootstrap/scss/spreadsheet/_theme.scss b/packages/bootstrap/scss/spreadsheet/_theme.scss index efd3aab5a63..1320417ebf0 100644 --- a/packages/bootstrap/scss/spreadsheet/_theme.scss +++ b/packages/bootstrap/scss/spreadsheet/_theme.scss @@ -2,7 +2,7 @@ @use "./_variables.scss" as *; @use "../button/_variables.scss" as *; @use "../list/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/spreadsheet/_theme.scss"; +@use "@progress/kendo-theme-default/scss/spreadsheet/_theme.scss" as *; @mixin kendo-spreadsheet--theme() { diff --git a/packages/bootstrap/scss/spreadsheet/_variables.scss b/packages/bootstrap/scss/spreadsheet/_variables.scss index ce729490111..57d466a5bf8 100644 --- a/packages/bootstrap/scss/spreadsheet/_variables.scss +++ b/packages/bootstrap/scss/spreadsheet/_variables.scss @@ -264,3 +264,86 @@ $kendo-spreadsheet-drawing-anchor-bg: if($kendo-enable-color-system, color-mix(i /// The vertical spacing of the Spreadsheet DropZone. /// @group spreadsheet $kendo-spreadsheet-dropzone-spacing-y: k-spacing(4) !default; + + +@forward "@progress/kendo-theme-default/scss/spreadsheet/_variables.scss" with ( + $kendo-spreadsheet-border-width: $kendo-spreadsheet-border-width, + $kendo-spreadsheet-font-family: $kendo-spreadsheet-font-family, + $kendo-spreadsheet-font-size: $kendo-spreadsheet-font-size, + $kendo-spreadsheet-line-height: $kendo-spreadsheet-line-height, + $kendo-spreadsheet-bg: $kendo-spreadsheet-bg, + $kendo-spreadsheet-text: $kendo-spreadsheet-text, + $kendo-spreadsheet-border: $kendo-spreadsheet-border, + $kendo-spreadsheet-header-bg: $kendo-spreadsheet-header-bg, + $kendo-spreadsheet-header-text: $kendo-spreadsheet-header-text, + $kendo-spreadsheet-header-border: $kendo-spreadsheet-header-border, + $kendo-spreadsheet-header-gradient: $kendo-spreadsheet-header-gradient, + $kendo-spreadsheet-table-header-bg: $kendo-spreadsheet-table-header-bg, + $kendo-spreadsheet-table-header-text: $kendo-spreadsheet-table-header-text, + $kendo-spreadsheet-table-header-border: $kendo-spreadsheet-table-header-border, + $kendo-spreadsheet-table-header-gradient: $kendo-spreadsheet-table-header-gradient, + $kendo-spreadsheet-action-bar-border-width: $kendo-spreadsheet-action-bar-border-width, + $kendo-spreadsheet-action-bar-padding-y: $kendo-spreadsheet-action-bar-padding-y, + $kendo-spreadsheet-action-bar-padding-x: $kendo-spreadsheet-action-bar-padding-x, + $kendo-spreadsheet-action-bar-font-size: $kendo-spreadsheet-action-bar-font-size, + $kendo-spreadsheet-action-bar-font-family: $kendo-spreadsheet-action-bar-font-family, + $kendo-spreadsheet-action-bar-spacing: $kendo-spreadsheet-action-bar-spacing, + $kendo-spreadsheet-formula-bar-gap: $kendo-spreadsheet-formula-bar-gap, + $kendo-spreadsheet-formula-input-padding-x: $kendo-spreadsheet-formula-input-padding-x, + $kendo-spreadsheet-formula-input-padding-y: $kendo-spreadsheet-formula-input-padding-y, + $kendo-spreadsheet-formula-input-line-height: $kendo-spreadsheet-formula-input-line-height, + $kendo-spreadsheet-view-font-family: $kendo-spreadsheet-view-font-family, + $kendo-spreadsheet-view-font-size: $kendo-spreadsheet-view-font-size, + $kendo-spreadsheet-selection-bg: $kendo-spreadsheet-selection-bg, + $kendo-spreadsheet-selection-text: $kendo-spreadsheet-selection-text, + $kendo-spreadsheet-selection-border: $kendo-spreadsheet-selection-border, + $kendo-spreadsheet-selection-shadow: $kendo-spreadsheet-selection-shadow, + $kendo-spreadsheet-single-selection-bg: $kendo-spreadsheet-single-selection-bg, + $kendo-spreadsheet-single-selection-text: $kendo-spreadsheet-single-selection-text, + $kendo-spreadsheet-single-selection-border: $kendo-spreadsheet-single-selection-border, + $kendo-spreadsheet-partial-selection-bg: $kendo-spreadsheet-partial-selection-bg, + $kendo-spreadsheet-active-cell-bg: $kendo-spreadsheet-active-cell-bg, + $kendo-spreadsheet-active-cell-shadow: $kendo-spreadsheet-active-cell-shadow, + $kendo-spreadsheet-auto-fill-bg: $kendo-spreadsheet-auto-fill-bg, + $kendo-spreadsheet-auto-fill-text: $kendo-spreadsheet-auto-fill-text, + $kendo-spreadsheet-auto-fill-border: $kendo-spreadsheet-auto-fill-border, + $kendo-spreadsheet-auto-fill-shadow: $kendo-spreadsheet-auto-fill-shadow, + $kendo-spreadsheet-auto-fill-punch-bg: $kendo-spreadsheet-auto-fill-punch-bg, + $kendo-spreadsheet-cell-padding-y: $kendo-spreadsheet-cell-padding-y, + $kendo-spreadsheet-cell-padding-x: $kendo-spreadsheet-cell-padding-x, + $kendo-spreadsheet-cell-editor-line-height: $kendo-spreadsheet-cell-editor-line-height, + $kendo-spreadsheet-cell-editor-padding-x: $kendo-spreadsheet-cell-editor-padding-x, + $kendo-spreadsheet-cell-editor-padding-y: $kendo-spreadsheet-cell-editor-padding-y, + $kendo-spreadsheet-cell-editor-bg: $kendo-spreadsheet-cell-editor-bg, + $kendo-spreadsheet-cell-editor-text: $kendo-spreadsheet-cell-editor-text, + $kendo-spreadsheet-cell-editor-border: $kendo-spreadsheet-cell-editor-border, + $kendo-spreadsheet-resize-handle-bg: $kendo-spreadsheet-resize-handle-bg, + $kendo-spreadsheet-cell-comment-border: $kendo-spreadsheet-cell-comment-border, + $kendo-spreadsheet-cell-dirty-border: $kendo-spreadsheet-cell-dirty-border, + $kendo-spreadsheet-sheets-bar-padding-x: $kendo-spreadsheet-sheets-bar-padding-x, + $kendo-spreadsheet-sheets-bar-padding-y: $kendo-spreadsheet-sheets-bar-padding-y, + $kendo-spreadsheet-sheets-bar-border-width: $kendo-spreadsheet-sheets-bar-border-width, + $kendo-spreadsheet-insert-image-dialog-border-style: $kendo-spreadsheet-insert-image-dialog-border-style, + $kendo-spreadsheet-insert-image-dialog-border-width: $kendo-spreadsheet-insert-image-dialog-border-width, + $kendo-spreadsheet-insert-image-dialog-text-margin-bottom: $kendo-spreadsheet-insert-image-dialog-text-margin-bottom, + $kendo-spreadsheet-insert-image-dialog-preview-width: $kendo-spreadsheet-insert-image-dialog-preview-width, + $kendo-spreadsheet-insert-image-dialog-preview-height: $kendo-spreadsheet-insert-image-dialog-preview-height, + $kendo-spreadsheet-insert-image-dialog-preview-img: $kendo-spreadsheet-insert-image-dialog-preview-img, + $kendo-spreadsheet-insert-image-dialog-preview-border: $kendo-spreadsheet-insert-image-dialog-preview-border, + $kendo-spreadsheet-insert-image-dialog-preview-border-radius: $kendo-spreadsheet-insert-image-dialog-preview-border-radius, + $kendo-spreadsheet-insert-image-dialog-preview-overlay-shadow: $kendo-spreadsheet-insert-image-dialog-preview-overlay-shadow, + $kendo-spreadsheet-insert-image-dialog-preview-overlay-border-radius: $kendo-spreadsheet-insert-image-dialog-preview-overlay-border-radius, + $kendo-spreadsheet-insert-image-dialog-overlay-hover-text: $kendo-spreadsheet-insert-image-dialog-overlay-hover-text, + $kendo-spreadsheet-drawing-handle-width: $kendo-spreadsheet-drawing-handle-width, + $kendo-spreadsheet-drawing-handle-height: $kendo-spreadsheet-drawing-handle-height, + $kendo-spreadsheet-drawing-handle-border-style: $kendo-spreadsheet-drawing-handle-border-style, + $kendo-spreadsheet-drawing-handle-border-width: $kendo-spreadsheet-drawing-handle-border-width, + $kendo-spreadsheet-drawing-handle-outline-color: $kendo-spreadsheet-drawing-handle-outline-color, + $kendo-spreadsheet-drawing-handle-border-color: $kendo-spreadsheet-drawing-handle-border-color, + $kendo-spreadsheet-drawing-handle-bg: $kendo-spreadsheet-drawing-handle-bg, + $kendo-spreadsheet-drawing-handle-border-radius: $kendo-spreadsheet-drawing-handle-border-radius, + $kendo-spreadsheet-drawing-outline-style: $kendo-spreadsheet-drawing-outline-style, + $kendo-spreadsheet-drawing-outline-width: $kendo-spreadsheet-drawing-outline-width, + $kendo-spreadsheet-drawing-anchor-bg: $kendo-spreadsheet-drawing-anchor-bg, + $kendo-spreadsheet-dropzone-spacing-y: $kendo-spreadsheet-dropzone-spacing-y +); diff --git a/packages/bootstrap/scss/stepper/_index.scss b/packages/bootstrap/scss/stepper/_index.scss index f9c3e70c091..21364c517c0 100644 --- a/packages/bootstrap/scss/stepper/_index.scss +++ b/packages/bootstrap/scss/stepper/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; @use "../progressbar/_index.scss" as *; + // Expose -@mixin stepper-styles() { +@mixin kendo-stepper--styles() { @include import-once( "stepper" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-progressbar--styles(); @include kendo-stepper--layout(); @include kendo-stepper--theme(); } diff --git a/packages/bootstrap/scss/stepper/_layout.scss b/packages/bootstrap/scss/stepper/_layout.scss index 6a32e66ee3f..b1f02564bbc 100644 --- a/packages/bootstrap/scss/stepper/_layout.scss +++ b/packages/bootstrap/scss/stepper/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/stepper/_layout.scss"; +@use "@progress/kendo-theme-default/scss/stepper/_layout.scss" as *; @mixin kendo-stepper--layout() { diff --git a/packages/bootstrap/scss/stepper/_theme.scss b/packages/bootstrap/scss/stepper/_theme.scss index 84f1d1938b5..e9b03c68233 100644 --- a/packages/bootstrap/scss/stepper/_theme.scss +++ b/packages/bootstrap/scss/stepper/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/stepper/_theme.scss"; +@use "@progress/kendo-theme-default/scss/stepper/_theme.scss" as *; @mixin kendo-stepper--theme() { diff --git a/packages/bootstrap/scss/stepper/_variables.scss b/packages/bootstrap/scss/stepper/_variables.scss index 347a75ba0c5..81d756b58e2 100644 --- a/packages/bootstrap/scss/stepper/_variables.scss +++ b/packages/bootstrap/scss/stepper/_variables.scss @@ -228,3 +228,76 @@ $kendo-stepper-content-transition-duration: 300ms !default; /// The timing function of the Stepper transition. /// @group stepper $kendo-stepper-content-transition-timing-function: cubic-bezier(.4, 0, .2, 1) 0ms !default; + + +@forward "@progress/kendo-theme-default/scss/stepper/_variables.scss" with ( + $kendo-stepper-margin-x: $kendo-stepper-margin-x, + $kendo-stepper-margin-y: $kendo-stepper-margin-y, + $kendo-stepper-padding-x: $kendo-stepper-padding-x, + $kendo-stepper-padding-y: $kendo-stepper-padding-y, + $kendo-stepper-label-margin-x: $kendo-stepper-label-margin-x, + $kendo-stepper-label-padding-x: $kendo-stepper-label-padding-x, + $kendo-stepper-label-padding-y: $kendo-stepper-label-padding-y, + $kendo-stepper-label-border-radius: $kendo-stepper-label-border-radius, + $kendo-stepper-border-width: $kendo-stepper-border-width, + $kendo-stepper-inline-content-padding-x: $kendo-stepper-inline-content-padding-x, + $kendo-stepper-inline-content-padding-y: $kendo-stepper-inline-content-padding-y, + $kendo-stepper-font-size: $kendo-stepper-font-size, + $kendo-stepper-line-height: $kendo-stepper-line-height, + $kendo-stepper-font-family: $kendo-stepper-font-family, + $kendo-stepper-bg: $kendo-stepper-bg, + $kendo-stepper-text: $kendo-stepper-text, + $kendo-stepper-border: $kendo-stepper-border, + $kendo-stepper-indicator-width: $kendo-stepper-indicator-width, + $kendo-stepper-indicator-height: $kendo-stepper-indicator-height, + $kendo-stepper-indicator-border-radius: $kendo-stepper-indicator-border-radius, + $kendo-stepper-indicator-border-width: $kendo-stepper-indicator-border-width, + $kendo-stepper-indicator-focus-border-width: $kendo-stepper-indicator-focus-border-width, + $kendo-stepper-indicator-focus-size: $kendo-stepper-indicator-focus-size, + $kendo-stepper-indicator-focus-offset: $kendo-stepper-indicator-focus-offset, + $kendo-stepper-indicator-focus-calc-offset: $kendo-stepper-indicator-focus-calc-offset, + $kendo-stepper-indicator-bg: $kendo-stepper-indicator-bg, + $kendo-stepper-indicator-text: $kendo-stepper-indicator-text, + $kendo-stepper-indicator-border: $kendo-stepper-indicator-border, + $kendo-stepper-indicator-hover-bg: $kendo-stepper-indicator-hover-bg, + $kendo-stepper-indicator-hover-text: $kendo-stepper-indicator-hover-text, + $kendo-stepper-indicator-hover-border: $kendo-stepper-indicator-hover-border, + $kendo-stepper-indicator-disabled-bg: $kendo-stepper-indicator-disabled-bg, + $kendo-stepper-indicator-disabled-text: $kendo-stepper-indicator-disabled-text, + $kendo-stepper-indicator-disabled-border: $kendo-stepper-indicator-disabled-border, + $kendo-stepper-indicator-done-bg: $kendo-stepper-indicator-done-bg, + $kendo-stepper-indicator-done-text: $kendo-stepper-indicator-done-text, + $kendo-stepper-indicator-done-border: $kendo-stepper-indicator-done-border, + $kendo-stepper-indicator-done-hover-bg: $kendo-stepper-indicator-done-hover-bg, + $kendo-stepper-indicator-done-hover-text: $kendo-stepper-indicator-done-hover-text, + $kendo-stepper-indicator-done-hover-border: $kendo-stepper-indicator-done-hover-border, + $kendo-stepper-indicator-done-disabled-bg: $kendo-stepper-indicator-done-disabled-bg, + $kendo-stepper-indicator-done-disabled-text: $kendo-stepper-indicator-done-disabled-text, + $kendo-stepper-indicator-done-disabled-border: $kendo-stepper-indicator-done-disabled-border, + $kendo-stepper-indicator-current-bg: $kendo-stepper-indicator-current-bg, + $kendo-stepper-indicator-current-text: $kendo-stepper-indicator-current-text, + $kendo-stepper-indicator-current-border: $kendo-stepper-indicator-current-border, + $kendo-stepper-indicator-current-hover-bg: $kendo-stepper-indicator-current-hover-bg, + $kendo-stepper-indicator-current-hover-text: $kendo-stepper-indicator-current-hover-text, + $kendo-stepper-indicator-current-hover-border: $kendo-stepper-indicator-current-hover-border, + $kendo-stepper-indicator-current-disabled-bg: $kendo-stepper-indicator-current-disabled-bg, + $kendo-stepper-indicator-current-disabled-text: $kendo-stepper-indicator-current-disabled-text, + $kendo-stepper-indicator-current-disabled-border: $kendo-stepper-indicator-current-disabled-border, + $kendo-stepper-label-text: $kendo-stepper-label-text, + $kendo-stepper-label-success-text: $kendo-stepper-label-success-text, + $kendo-stepper-label-error-text: $kendo-stepper-label-error-text, + $kendo-stepper-label-hover-text: $kendo-stepper-label-hover-text, + $kendo-stepper-label-disabled-text: $kendo-stepper-label-disabled-text, + $kendo-stepper-optional-label-text: $kendo-stepper-optional-label-text, + $kendo-stepper-optional-label-opacity: $kendo-stepper-optional-label-opacity, + $kendo-stepper-optional-label-font-size: $kendo-stepper-optional-label-font-size, + $kendo-stepper-optional-label-font-style: $kendo-stepper-optional-label-font-style, + $kendo-stepper-progressbar-size: $kendo-stepper-progressbar-size, + $kendo-stepper-progressbar-bg: $kendo-stepper-progressbar-bg, + $kendo-stepper-progressbar-text: $kendo-stepper-progressbar-text, + $kendo-stepper-progressbar-fill-bg: $kendo-stepper-progressbar-fill-bg, + $kendo-stepper-progressbar-fill-text: $kendo-stepper-progressbar-fill-text, + $kendo-stepper-content-transition-property: $kendo-stepper-content-transition-property, + $kendo-stepper-content-transition-duration: $kendo-stepper-content-transition-duration, + $kendo-stepper-content-transition-timing-function: $kendo-stepper-content-transition-timing-function +); diff --git a/packages/bootstrap/scss/switch/_index.scss b/packages/bootstrap/scss/switch/_index.scss index 22cdfd95230..677b4e82d3f 100644 --- a/packages/bootstrap/scss/switch/_index.scss +++ b/packages/bootstrap/scss/switch/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin switch-styles() { +@mixin kendo-switch--styles() { @include import-once( "switch" ) { + @include core-styles(); @include kendo-switch--layout(); @include kendo-switch--theme(); } diff --git a/packages/bootstrap/scss/switch/_layout.scss b/packages/bootstrap/scss/switch/_layout.scss index 9e01dbc0da5..aba09050917 100644 --- a/packages/bootstrap/scss/switch/_layout.scss +++ b/packages/bootstrap/scss/switch/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/switch/_layout.scss"; +@use "@progress/kendo-theme-default/scss/switch/_layout.scss" as *; @mixin kendo-switch--layout() { diff --git a/packages/bootstrap/scss/switch/_theme.scss b/packages/bootstrap/scss/switch/_theme.scss index d29fae36bf8..8d3ebdb7265 100644 --- a/packages/bootstrap/scss/switch/_theme.scss +++ b/packages/bootstrap/scss/switch/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/switch/_theme.scss"; +@use "@progress/kendo-theme-default/scss/switch/_theme.scss" as *; @mixin kendo-switch--theme() { diff --git a/packages/bootstrap/scss/switch/_variables.scss b/packages/bootstrap/scss/switch/_variables.scss index 0af47b5db07..180ae3f8fc4 100644 --- a/packages/bootstrap/scss/switch/_variables.scss +++ b/packages/bootstrap/scss/switch/_variables.scss @@ -193,3 +193,63 @@ $kendo-switch-on-thumb-hover-border: null !default; /// The background gradient of the thumb when the hovered Switch is checked. /// @group switch $kendo-switch-on-thumb-hover-gradient: null !default; + + +@forward "@progress/kendo-theme-default/scss/switch/_variables.scss" with ( + $kendo-switch-font-family: $kendo-switch-font-family, + $kendo-switch-track-border-width: $kendo-switch-track-border-width, + $kendo-switch-thumb-border-width: $kendo-switch-thumb-border-width, + $kendo-switch-label-text-transform: $kendo-switch-label-text-transform, + $kendo-switch-label-display: $kendo-switch-label-display, + $kendo-switch-sizes: $kendo-switch-sizes, + $kendo-switch-off-track-bg: $kendo-switch-off-track-bg, + $kendo-switch-off-track-text: $kendo-switch-off-track-text, + $kendo-switch-off-track-border: $kendo-switch-off-track-border, + $kendo-switch-off-track-gradient: $kendo-switch-off-track-gradient, + $kendo-switch-off-track-hover-bg: $kendo-switch-off-track-hover-bg, + $kendo-switch-off-track-hover-text: $kendo-switch-off-track-hover-text, + $kendo-switch-off-track-hover-border: $kendo-switch-off-track-hover-border, + $kendo-switch-off-track-hover-gradient: $kendo-switch-off-track-hover-gradient, + $kendo-switch-off-track-focus-bg: $kendo-switch-off-track-focus-bg, + $kendo-switch-off-track-focus-text: $kendo-switch-off-track-focus-text, + $kendo-switch-off-track-focus-border: $kendo-switch-off-track-focus-border, + $kendo-switch-off-track-focus-gradient: $kendo-switch-off-track-focus-gradient, + $kendo-switch-off-track-focus-ring: $kendo-switch-off-track-focus-ring, + $kendo-switch-off-track-disabled-bg: $kendo-switch-off-track-disabled-bg, + $kendo-switch-off-track-disabled-text: $kendo-switch-off-track-disabled-text, + $kendo-switch-off-track-disabled-border: $kendo-switch-off-track-disabled-border, + $kendo-switch-off-track-disabled-gradient: $kendo-switch-off-track-disabled-gradient, + $kendo-switch-off-thumb-bg: $kendo-switch-off-thumb-bg, + $kendo-switch-off-thumb-text: $kendo-switch-off-thumb-text, + $kendo-switch-off-thumb-border: $kendo-switch-off-thumb-border, + $kendo-switch-off-thumb-gradient: $kendo-switch-off-thumb-gradient, + $kendo-switch-off-thumb-hover-bg: $kendo-switch-off-thumb-hover-bg, + $kendo-switch-off-thumb-hover-text: $kendo-switch-off-thumb-hover-text, + $kendo-switch-off-thumb-hover-border: $kendo-switch-off-thumb-hover-border, + $kendo-switch-off-thumb-hover-gradient: $kendo-switch-off-thumb-hover-gradient, + $kendo-switch-on-track-bg: $kendo-switch-on-track-bg, + $kendo-switch-on-track-text: $kendo-switch-on-track-text, + $kendo-switch-on-track-border: $kendo-switch-on-track-border, + $kendo-switch-on-track-gradient: $kendo-switch-on-track-gradient, + $kendo-switch-on-track-hover-bg: $kendo-switch-on-track-hover-bg, + $kendo-switch-on-track-hover-text: $kendo-switch-on-track-hover-text, + $kendo-switch-on-track-hover-border: $kendo-switch-on-track-hover-border, + $kendo-switch-on-track-hover-gradient: $kendo-switch-on-track-hover-gradient, + $kendo-switch-on-track-focus-bg: $kendo-switch-on-track-focus-bg, + $kendo-switch-on-track-focus-text: $kendo-switch-on-track-focus-text, + $kendo-switch-on-track-focus-border: $kendo-switch-on-track-focus-border, + $kendo-switch-on-track-focus-gradient: $kendo-switch-on-track-focus-gradient, + $kendo-switch-on-track-focus-ring: $kendo-switch-on-track-focus-ring, + $kendo-switch-on-track-disabled-bg: $kendo-switch-on-track-disabled-bg, + $kendo-switch-on-track-disabled-text: $kendo-switch-on-track-disabled-text, + $kendo-switch-on-track-disabled-border: $kendo-switch-on-track-disabled-border, + $kendo-switch-on-track-disabled-gradient: $kendo-switch-on-track-disabled-gradient, + $kendo-switch-on-thumb-bg: $kendo-switch-on-thumb-bg, + $kendo-switch-on-thumb-text: $kendo-switch-on-thumb-text, + $kendo-switch-on-thumb-border: $kendo-switch-on-thumb-border, + $kendo-switch-on-thumb-gradient: $kendo-switch-on-thumb-gradient, + $kendo-switch-on-thumb-hover-bg: $kendo-switch-on-thumb-hover-bg, + $kendo-switch-on-thumb-hover-text: $kendo-switch-on-thumb-hover-text, + $kendo-switch-on-thumb-hover-border: $kendo-switch-on-thumb-hover-border, + $kendo-switch-on-thumb-hover-gradient: $kendo-switch-on-thumb-hover-gradient +); diff --git a/packages/bootstrap/scss/table/_index.scss b/packages/bootstrap/scss/table/_index.scss index 13b9e75941a..d4f3ef0381b 100644 --- a/packages/bootstrap/scss/table/_index.scss +++ b/packages/bootstrap/scss/table/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin table-styles() { +@mixin kendo-table--styles() { @include import-once( "table" ) { + @include core-styles(); @include kendo-table--layout(); @include kendo-table--theme(); } diff --git a/packages/bootstrap/scss/table/_layout.scss b/packages/bootstrap/scss/table/_layout.scss index 1b9ee1217db..252389fbae7 100644 --- a/packages/bootstrap/scss/table/_layout.scss +++ b/packages/bootstrap/scss/table/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/table/_layout.scss"; +@use "@progress/kendo-theme-default/scss/table/_layout.scss" as *; @mixin kendo-table--layout() { diff --git a/packages/bootstrap/scss/table/_theme.scss b/packages/bootstrap/scss/table/_theme.scss index f3c4550e1e8..88439cdda39 100644 --- a/packages/bootstrap/scss/table/_theme.scss +++ b/packages/bootstrap/scss/table/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/table/_theme.scss"; +@use "@progress/kendo-theme-default/scss/table/_theme.scss" as *; @mixin kendo-table--theme() { diff --git a/packages/bootstrap/scss/table/_variables.scss b/packages/bootstrap/scss/table/_variables.scss index 67b21a45ff7..b17acdc929b 100644 --- a/packages/bootstrap/scss/table/_variables.scss +++ b/packages/bootstrap/scss/table/_variables.scss @@ -1,7 +1,8 @@ // @use "sass:map"; // @use "../core/_index.scss" as *; -@use "../list/_variables.scss" as *; - +@use "sass:map"; +@use "../core/_index.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // Table @@ -156,3 +157,47 @@ $kendo-table-selected-text: $kendo-table-text !default; /// Border color of selected rows in table. /// @group table $kendo-table-selected-border: null !default; + + +@forward "@progress/kendo-theme-default/scss/table/_variables.scss" with ( + $kendo-table-border-width: $kendo-table-border-width, + $kendo-table-cell-vertical-border-width: $kendo-table-cell-vertical-border-width, + $kendo-table-cell-horizontal-border-width: $kendo-table-cell-horizontal-border-width, + $kendo-table-font-size: $kendo-table-font-size, + $kendo-table-line-height: $kendo-table-line-height, + $kendo-table-cell-padding-x: $kendo-table-cell-padding-x, + $kendo-table-cell-padding-y: $kendo-table-cell-padding-y, + $kendo-table-sm-cell-padding-x: $kendo-table-sm-cell-padding-x, + $kendo-table-sm-cell-padding-y: $kendo-table-sm-cell-padding-y, + $kendo-table-md-cell-padding-x: $kendo-table-md-cell-padding-x, + $kendo-table-md-cell-padding-y: $kendo-table-md-cell-padding-y, + $kendo-table-lg-cell-padding-x: $kendo-table-lg-cell-padding-x, + $kendo-table-lg-cell-padding-y: $kendo-table-lg-cell-padding-y, + $kendo-table-sizes: $kendo-table-sizes, + $kendo-table-bg: $kendo-table-bg, + $kendo-table-text: $kendo-table-text, + $kendo-table-border: $kendo-table-border, + $kendo-table-header-bg: $kendo-table-header-bg, + $kendo-table-header-text: $kendo-table-header-text, + $kendo-table-header-border: $kendo-table-header-border, + $kendo-table-header-gradient: $kendo-table-header-gradient, + $kendo-table-footer-bg: $kendo-table-footer-bg, + $kendo-table-footer-text: $kendo-table-footer-text, + $kendo-table-footer-border: $kendo-table-footer-border, + $kendo-table-group-row-bg: $kendo-table-group-row-bg, + $kendo-table-group-row-text: $kendo-table-group-row-text, + $kendo-table-group-row-border: $kendo-table-group-row-border, + $kendo-table-alt-row-bg: $kendo-table-alt-row-bg, + $kendo-table-alt-row-text: $kendo-table-alt-row-text, + $kendo-table-alt-row-border: $kendo-table-alt-row-border, + $kendo-table-hover-bg: $kendo-table-hover-bg, + $kendo-table-hover-text: $kendo-table-hover-text, + $kendo-table-hover-border: $kendo-table-hover-border, + $kendo-table-focus-bg: $kendo-table-focus-bg, + $kendo-table-focus-text: $kendo-table-focus-text, + $kendo-table-focus-border: $kendo-table-focus-border, + $kendo-table-focus-shadow: $kendo-table-focus-shadow, + $kendo-table-selected-bg: $kendo-table-selected-bg, + $kendo-table-selected-text: $kendo-table-selected-text, + $kendo-table-selected-border: $kendo-table-selected-border +); diff --git a/packages/bootstrap/scss/tabstrip/_index.scss b/packages/bootstrap/scss/tabstrip/_index.scss index d3ac386e2e4..d1665f50ebb 100644 --- a/packages/bootstrap/scss/tabstrip/_index.scss +++ b/packages/bootstrap/scss/tabstrip/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -10,9 +11,14 @@ @use "../icons/_index.scss" as *; @use "../list/_index.scss" as *; + // Expose -@mixin tabstrip-styles() { +@mixin kendo-tabstrip--styles() { @include import-once( "tabstrip" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-icon--styles(); + @include kendo-list--styles(); @include kendo-tabstrip--layout(); @include kendo-tabstrip--theme(); @include kendo-utils--layout--overflow(); diff --git a/packages/bootstrap/scss/tabstrip/_layout.scss b/packages/bootstrap/scss/tabstrip/_layout.scss index a71cf5f4a5a..fa526f7bf79 100644 --- a/packages/bootstrap/scss/tabstrip/_layout.scss +++ b/packages/bootstrap/scss/tabstrip/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/tabstrip/_layout.scss"; +@use "@progress/kendo-theme-default/scss/tabstrip/_layout.scss" as *; @mixin kendo-tabstrip--layout() { diff --git a/packages/bootstrap/scss/tabstrip/_theme.scss b/packages/bootstrap/scss/tabstrip/_theme.scss index f0de3b29277..40e07dd4f08 100644 --- a/packages/bootstrap/scss/tabstrip/_theme.scss +++ b/packages/bootstrap/scss/tabstrip/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/tabstrip/_theme.scss"; +@use "@progress/kendo-theme-default/scss/tabstrip/_theme.scss" as *; @mixin kendo-tabstrip--theme() { diff --git a/packages/bootstrap/scss/tabstrip/_variables.scss b/packages/bootstrap/scss/tabstrip/_variables.scss index 1bada3c71e8..9336eac9ce6 100644 --- a/packages/bootstrap/scss/tabstrip/_variables.scss +++ b/packages/bootstrap/scss/tabstrip/_variables.scss @@ -1,6 +1,6 @@ -@use "sass:map"; @use "../core/_index.scss" as *; @use "../list/_variables.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // TabStrip @@ -162,3 +162,55 @@ $kendo-tabstrip-content-border: $kendo-component-border !default; /// The border color of the focused TabStrip content. /// @group tabstrip $kendo-tabstrip-content-focus-border: $kendo-component-text !default; + + +@forward "@progress/kendo-theme-default/scss/tabstrip/_variables.scss" with ( + $kendo-tabstrip-wrapper-padding-x: $kendo-tabstrip-wrapper-padding-x, + $kendo-tabstrip-wrapper-padding-y: $kendo-tabstrip-wrapper-padding-y, + $kendo-tabstrip-wrapper-border-width: $kendo-tabstrip-wrapper-border-width, + $kendo-tabstrip-font-family: $kendo-tabstrip-font-family, + $kendo-tabstrip-font-size: $kendo-tabstrip-font-size, + $kendo-tabstrip-line-height: $kendo-tabstrip-line-height, + $kendo-tabstrip-border-width: $kendo-tabstrip-border-width, + $kendo-tabstrip-wrapper-bg: $kendo-tabstrip-wrapper-bg, + $kendo-tabstrip-wrapper-text: $kendo-tabstrip-wrapper-text, + $kendo-tabstrip-wrapper-border: $kendo-tabstrip-wrapper-border, + $kendo-tabstrip-bg: $kendo-tabstrip-bg, + $kendo-tabstrip-text: $kendo-tabstrip-text, + $kendo-tabstrip-border: $kendo-tabstrip-border, + $kendo-tabstrip-item-padding-x: $kendo-tabstrip-item-padding-x, + $kendo-tabstrip-item-padding-y: $kendo-tabstrip-item-padding-y, + $kendo-tabstrip-item-border-width: $kendo-tabstrip-item-border-width, + $kendo-tabstrip-item-border-radius: $kendo-tabstrip-item-border-radius, + $kendo-tabstrip-item-gap: $kendo-tabstrip-item-gap, + $kendo-tabstrip-item-bg: $kendo-tabstrip-item-bg, + $kendo-tabstrip-item-text: $kendo-tabstrip-item-text, + $kendo-tabstrip-item-border: $kendo-tabstrip-item-border, + $kendo-tabstrip-item-gradient: $kendo-tabstrip-item-gradient, + $kendo-tabstrip-item-hover-bg: $kendo-tabstrip-item-hover-bg, + $kendo-tabstrip-item-hover-text: $kendo-tabstrip-item-hover-text, + $kendo-tabstrip-item-hover-border: $kendo-tabstrip-item-hover-border, + $kendo-tabstrip-item-hover-gradient: $kendo-tabstrip-item-hover-gradient, + $kendo-tabstrip-item-selected-bg: $kendo-tabstrip-item-selected-bg, + $kendo-tabstrip-item-selected-text: $kendo-tabstrip-item-selected-text, + $kendo-tabstrip-item-selected-border: $kendo-tabstrip-item-selected-border, + $kendo-tabstrip-item-selected-gradient: $kendo-tabstrip-item-selected-gradient, + $kendo-tabstrip-item-selected-font-weight: $kendo-tabstrip-item-selected-font-weight, + $kendo-tabstrip-item-focus-shadow: $kendo-tabstrip-item-focus-shadow, + $kendo-tabstrip-item-dragging-shadow: $kendo-tabstrip-item-dragging-shadow, + $kendo-tabstrip-item-disabled-bg: $kendo-tabstrip-item-disabled-bg, + $kendo-tabstrip-item-disabled-text: $kendo-tabstrip-item-disabled-text, + $kendo-tabstrip-item-disabled-border: $kendo-tabstrip-item-disabled-border, + $kendo-tabstrip-item-disabled-gradient: $kendo-tabstrip-item-disabled-gradient, + $kendo-tabstrip-item-disabled-opacity: $kendo-tabstrip-item-disabled-opacity, + $kendo-tabstrip-item-disabled-filter: $kendo-tabstrip-item-disabled-filter, + $kendo-tabstrip-indicator-size: $kendo-tabstrip-indicator-size, + $kendo-tabstrip-indicator-color: $kendo-tabstrip-indicator-color, + $kendo-tabstrip-content-padding-x: $kendo-tabstrip-content-padding-x, + $kendo-tabstrip-content-padding-y: $kendo-tabstrip-content-padding-y, + $kendo-tabstrip-content-border-width: $kendo-tabstrip-content-border-width, + $kendo-tabstrip-content-bg: $kendo-tabstrip-content-bg, + $kendo-tabstrip-content-text: $kendo-tabstrip-content-text, + $kendo-tabstrip-content-border: $kendo-tabstrip-content-border, + $kendo-tabstrip-content-focus-border: $kendo-tabstrip-content-focus-border +); diff --git a/packages/bootstrap/scss/taskboard/_index.scss b/packages/bootstrap/scss/taskboard/_index.scss index 1f992a97d4c..a24d011299b 100644 --- a/packages/bootstrap/scss/taskboard/_index.scss +++ b/packages/bootstrap/scss/taskboard/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -14,11 +15,20 @@ @use "../toolbar/_index.scss" as *; @use "../card/_index.scss" as *; + // Expose -@mixin taskboard-styles() { - @include import-once( "taskboard" ) { - @include kendo-taskboard--layout(); - @include kendo-taskboard--theme(); +@mixin kendo-task-board--styles() { + @include import-once( "task-board" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-form--styles(); + @include kendo-input--styles(); + @include kendo-textbox--styles(); + @include kendo-searchbox--styles(); + @include kendo-toolbar--styles(); + @include kendo-card--styles(); + @include kendo-task-board--layout(); + @include kendo-task-board--theme(); @include kendo-utils--typography--text-overflow(); } } diff --git a/packages/bootstrap/scss/taskboard/_layout.scss b/packages/bootstrap/scss/taskboard/_layout.scss index e8d925f1666..c0464ae1682 100644 --- a/packages/bootstrap/scss/taskboard/_layout.scss +++ b/packages/bootstrap/scss/taskboard/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/taskboard/_layout.scss"; +@use "@progress/kendo-theme-default/scss/taskboard/_layout.scss" as *; @mixin kendo-task-board--layout() { diff --git a/packages/bootstrap/scss/taskboard/_theme.scss b/packages/bootstrap/scss/taskboard/_theme.scss index 4a177751138..1c99239422d 100644 --- a/packages/bootstrap/scss/taskboard/_theme.scss +++ b/packages/bootstrap/scss/taskboard/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/taskboard/_theme.scss"; +@use "@progress/kendo-theme-default/scss/taskboard/_theme.scss" as *; @mixin kendo-task-board--theme() { diff --git a/packages/bootstrap/scss/taskboard/_variables.scss b/packages/bootstrap/scss/taskboard/_variables.scss index d8c9eeabd7e..2292769b381 100644 --- a/packages/bootstrap/scss/taskboard/_variables.scss +++ b/packages/bootstrap/scss/taskboard/_variables.scss @@ -247,3 +247,82 @@ $kendo-taskboard-drag-placeholder-bg: if($kendo-enable-color-system, color-mix(i /// The border color of the TaskBoard Card placeholder. /// @group taskboard $kendo-taskboard-drag-placeholder-border: $kendo-component-border !default; + + +@forward "@progress/kendo-theme-default/scss/taskboard/_variables.scss" with ( + $kendo-taskboard-spacer: $kendo-taskboard-spacer, + $kendo-taskboard-padding-y: $kendo-taskboard-padding-y, + $kendo-taskboard-padding-x: $kendo-taskboard-padding-x, + $kendo-taskboard-font-family: $kendo-taskboard-font-family, + $kendo-taskboard-font-size: $kendo-taskboard-font-size, + $kendo-taskboard-line-height: $kendo-taskboard-line-height, + $kendo-taskboard-bg: $kendo-taskboard-bg, + $kendo-taskboard-text: $kendo-taskboard-text, + $kendo-taskboard-border: $kendo-taskboard-border, + $kendo-taskboard-toolbar-padding-y: $kendo-taskboard-toolbar-padding-y, + $kendo-taskboard-toolbar-padding-x: $kendo-taskboard-toolbar-padding-x, + $kendo-taskboard-toolbar-bg: $kendo-taskboard-toolbar-bg, + $kendo-taskboard-toolbar-text: $kendo-taskboard-toolbar-text, + $kendo-taskboard-toolbar-border: $kendo-taskboard-toolbar-border, + $kendo-taskboard-toolbar-gradient: $kendo-taskboard-toolbar-gradient, + $kendo-taskboard-content-padding-y: $kendo-taskboard-content-padding-y, + $kendo-taskboard-content-padding-x: $kendo-taskboard-content-padding-x, + $kendo-taskboard-column-container-spacing-y: $kendo-taskboard-column-container-spacing-y, + $kendo-taskboard-column-container-padding-y: $kendo-taskboard-column-container-padding-y, + $kendo-taskboard-column-container-padding-x: $kendo-taskboard-column-container-padding-x, + $kendo-taskboard-columns-container-gap: $kendo-taskboard-columns-container-gap, + $kendo-taskboard-column-width: $kendo-taskboard-column-width, + $kendo-taskboard-column-border-width: $kendo-taskboard-column-border-width, + $kendo-taskboard-column-border-radius: $kendo-taskboard-column-border-radius, + $kendo-taskboard-column-bg: $kendo-taskboard-column-bg, + $kendo-taskboard-column-text: $kendo-taskboard-column-text, + $kendo-taskboard-column-border: $kendo-taskboard-column-border, + $kendo-taskboard-column-focus-bg: $kendo-taskboard-column-focus-bg, + $kendo-taskboard-column-focus-text: $kendo-taskboard-column-focus-text, + $kendo-taskboard-column-focus-border: $kendo-taskboard-column-focus-border, + $kendo-taskboard-column-header-padding-y: $kendo-taskboard-column-header-padding-y, + $kendo-taskboard-column-header-padding-x: $kendo-taskboard-column-header-padding-x, + $kendo-taskboard-column-header-gap: $kendo-taskboard-column-header-gap, + $kendo-taskboard-column-header-actions-gap: $kendo-taskboard-column-header-actions-gap, + $kendo-taskboard-column-header-font-weight: $kendo-taskboard-column-header-font-weight, + $kendo-taskboard-column-header-text: $kendo-taskboard-column-header-text, + $kendo-taskboard-column-cards-padding-y: $kendo-taskboard-column-cards-padding-y, + $kendo-taskboard-column-cards-padding-x: $kendo-taskboard-column-cards-padding-x, + $kendo-taskboard-column-cards-gap: $kendo-taskboard-column-cards-gap, + $kendo-taskboard-pane-width: $kendo-taskboard-pane-width, + $kendo-taskboard-pane-padding-y: $kendo-taskboard-pane-padding-y, + $kendo-taskboard-pane-padding-x: $kendo-taskboard-pane-padding-x, + $kendo-taskboard-pane-border-width: $kendo-taskboard-pane-border-width, + $kendo-taskboard-pane-bg: $kendo-taskboard-pane-bg, + $kendo-taskboard-pane-text: $kendo-taskboard-pane-text, + $kendo-taskboard-pane-border: $kendo-taskboard-pane-border, + $kendo-taskboard-pane-header-padding-y: $kendo-taskboard-pane-header-padding-y, + $kendo-taskboard-pane-header-padding-x: $kendo-taskboard-pane-header-padding-x, + $kendo-taskboard-pane-header-font-weight: $kendo-taskboard-pane-header-font-weight, + $kendo-taskboard-pane-header-text: $kendo-taskboard-pane-header-text, + $kendo-taskboard-pane-content-padding-y: $kendo-taskboard-pane-content-padding-y, + $kendo-taskboard-pane-content-padding-x: $kendo-taskboard-pane-content-padding-x, + $kendo-taskboard-pane-actions-padding-y: $kendo-taskboard-pane-actions-padding-y, + $kendo-taskboard-pane-actions-padding-x: $kendo-taskboard-pane-actions-padding-x, + $kendo-taskboard-card-padding-y: $kendo-taskboard-card-padding-y, + $kendo-taskboard-card-padding-x: $kendo-taskboard-card-padding-x, + $kendo-taskboard-card-border-width: $kendo-taskboard-card-border-width, + $kendo-taskboard-card-border-radius: $kendo-taskboard-card-border-radius, + $kendo-taskboard-card-bg: $kendo-taskboard-card-bg, + $kendo-taskboard-card-text: $kendo-taskboard-card-text, + $kendo-taskboard-card-border: $kendo-taskboard-card-border, + $kendo-taskboard-card-shadow: $kendo-taskboard-card-shadow, + $kendo-taskboard-card-category-border-width: $kendo-taskboard-card-category-border-width, + $kendo-taskboard-card-hover-border: $kendo-taskboard-card-hover-border, + $kendo-taskboard-card-focus-border: $kendo-taskboard-card-focus-border, + $kendo-taskboard-card-focus-shadow: $kendo-taskboard-card-focus-shadow, + $kendo-taskboard-card-selected-border: $kendo-taskboard-card-selected-border, + $kendo-taskboard-card-selected-shadow: $kendo-taskboard-card-selected-shadow, + $kendo-taskboard-card-header-text: $kendo-taskboard-card-header-text, + $kendo-taskboard-card-header-focus-text: $kendo-taskboard-card-header-focus-text, + $kendo-taskboard-card-header-hover-text: $kendo-taskboard-card-header-hover-text, + $kendo-taskboard-drag-placeholder-border-width: $kendo-taskboard-drag-placeholder-border-width, + $kendo-taskboard-drag-placeholder-border-radius: $kendo-taskboard-drag-placeholder-border-radius, + $kendo-taskboard-drag-placeholder-bg: $kendo-taskboard-drag-placeholder-bg, + $kendo-taskboard-drag-placeholder-border: $kendo-taskboard-drag-placeholder-border +); diff --git a/packages/bootstrap/scss/textarea/_index.scss b/packages/bootstrap/scss/textarea/_index.scss index 7a68f3bd65c..52671f429d5 100644 --- a/packages/bootstrap/scss/textarea/_index.scss +++ b/packages/bootstrap/scss/textarea/_index.scss @@ -3,15 +3,20 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @use "../input/_index.scss" as *; @use "../floating-label/_index.scss" as *; + // Expose -@mixin textarea-styles() { +@mixin kendo-textarea--styles() { @include import-once( "textarea" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); @include kendo-textarea--layout(); @include kendo-textarea--theme(); @include kendo-utils--flex-grid--align-items(); diff --git a/packages/bootstrap/scss/textarea/_layout.scss b/packages/bootstrap/scss/textarea/_layout.scss index ff143325397..16781f329b9 100644 --- a/packages/bootstrap/scss/textarea/_layout.scss +++ b/packages/bootstrap/scss/textarea/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/textarea/_layout.scss"; +@use "@progress/kendo-theme-default/scss/textarea/_layout.scss" as *; @mixin kendo-textarea--layout() { diff --git a/packages/bootstrap/scss/textarea/_theme.scss b/packages/bootstrap/scss/textarea/_theme.scss index 6c3636b815e..bef39693e2c 100644 --- a/packages/bootstrap/scss/textarea/_theme.scss +++ b/packages/bootstrap/scss/textarea/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/textarea/_theme.scss"; +@use "@progress/kendo-theme-default/scss/textarea/_theme.scss" as *; @mixin kendo-textarea--theme() { diff --git a/packages/bootstrap/scss/textbox/_index.scss b/packages/bootstrap/scss/textbox/_index.scss index 3445a467d58..e59865fc8eb 100644 --- a/packages/bootstrap/scss/textbox/_index.scss +++ b/packages/bootstrap/scss/textbox/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @use "../floating-label/_index.scss" as *; + // Expose -@mixin textbox-styles() { +@mixin kendo-textbox--styles() { @include import-once( "textbox" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-floating-label--styles(); @include kendo-textbox--layout(); @include kendo-textbox--theme(); } diff --git a/packages/bootstrap/scss/textbox/_layout.scss b/packages/bootstrap/scss/textbox/_layout.scss index c2a66ec5073..58668b4c48a 100644 --- a/packages/bootstrap/scss/textbox/_layout.scss +++ b/packages/bootstrap/scss/textbox/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/textbox/_layout.scss"; +@use "@progress/kendo-theme-default/scss/textbox/_layout.scss" as *; @mixin kendo-textbox--layout() { diff --git a/packages/bootstrap/scss/textbox/_theme.scss b/packages/bootstrap/scss/textbox/_theme.scss index 4be83fd717b..ea7449be0eb 100644 --- a/packages/bootstrap/scss/textbox/_theme.scss +++ b/packages/bootstrap/scss/textbox/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/textbox/_theme.scss"; +@use "@progress/kendo-theme-default/scss/textbox/_theme.scss" as *; @mixin kendo-textbox--theme() { diff --git a/packages/bootstrap/scss/tilelayout/_index.scss b/packages/bootstrap/scss/tilelayout/_index.scss index 91635d50fcf..12a266dc084 100644 --- a/packages/bootstrap/scss/tilelayout/_index.scss +++ b/packages/bootstrap/scss/tilelayout/_index.scss @@ -3,15 +3,20 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @use "../card/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin tilelayout-styles() { - @include import-once( "tilelayout" ) { +@mixin kendo-tile-layout--styles() { + @include import-once( "tile-layout" ) { + @include core-styles(); + @include kendo-card--styles(); + @include kendo-icon--styles(); @include kendo-tile-layout--layout(); @include kendo-tile-layout--theme(); @include kendo-utils--interactivity--resize(); diff --git a/packages/bootstrap/scss/tilelayout/_layout.scss b/packages/bootstrap/scss/tilelayout/_layout.scss index bd48b706248..7a5739df07f 100644 --- a/packages/bootstrap/scss/tilelayout/_layout.scss +++ b/packages/bootstrap/scss/tilelayout/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/tilelayout/_layout.scss"; +@use "@progress/kendo-theme-default/scss/tilelayout/_layout.scss" as *; @mixin kendo-tile-layout--layout() { diff --git a/packages/bootstrap/scss/tilelayout/_theme.scss b/packages/bootstrap/scss/tilelayout/_theme.scss index f0c39ed6633..3e6800a024a 100644 --- a/packages/bootstrap/scss/tilelayout/_theme.scss +++ b/packages/bootstrap/scss/tilelayout/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/tilelayout/_theme.scss"; +@use "@progress/kendo-theme-default/scss/tilelayout/_theme.scss" as *; @mixin kendo-tile-layout--theme() { diff --git a/packages/bootstrap/scss/tilelayout/_variables.scss b/packages/bootstrap/scss/tilelayout/_variables.scss index eb824c5b4e5..e4ba09695ee 100644 --- a/packages/bootstrap/scss/tilelayout/_variables.scss +++ b/packages/bootstrap/scss/tilelayout/_variables.scss @@ -38,3 +38,17 @@ $kendo-tile-layout-hint-border: $kendo-component-border !default; /// The background color of the TileLayout hint. /// @group tile-layout $kendo-tile-layout-hint-bg: rgba( white, .2 ) !default; + + +@forward "@progress/kendo-theme-default/scss/tilelayout/_variables.scss" with ( + $kendo-tile-layout-border-width: $kendo-tile-layout-border-width, + $kendo-tile-layout-bg: $kendo-tile-layout-bg, + $kendo-tile-layout-padding-x: $kendo-tile-layout-padding-x, + $kendo-tile-layout-padding-y: $kendo-tile-layout-padding-y, + $kendo-tile-layout-card-border-width: $kendo-tile-layout-card-border-width, + $kendo-tile-layout-card-focus-shadow: $kendo-tile-layout-card-focus-shadow, + $kendo-tile-layout-hint-border-width: $kendo-tile-layout-hint-border-width, + $kendo-tile-layout-hint-border-radius: $kendo-tile-layout-hint-border-radius, + $kendo-tile-layout-hint-border: $kendo-tile-layout-hint-border, + $kendo-tile-layout-hint-bg: $kendo-tile-layout-hint-bg +); diff --git a/packages/bootstrap/scss/time-marker/_index.scss b/packages/bootstrap/scss/time-marker/_index.scss index 49386626200..aaff45e0912 100644 --- a/packages/bootstrap/scss/time-marker/_index.scss +++ b/packages/bootstrap/scss/time-marker/_index.scss @@ -3,12 +3,15 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin time-marker-styles() { +@mixin kendo-time-marker--styles() { @include import-once( "time-marker" ) { + @include core-styles(); @include kendo-time-marker--layout(); @include kendo-time-marker--theme(); } diff --git a/packages/bootstrap/scss/time-marker/_layout.scss b/packages/bootstrap/scss/time-marker/_layout.scss index 78c4b3498da..355adc5fdfc 100644 --- a/packages/bootstrap/scss/time-marker/_layout.scss +++ b/packages/bootstrap/scss/time-marker/_layout.scss @@ -1,5 +1,5 @@ @use "./variables.scss" as *; -@import "@progress/kendo-theme-default/scss/time-marker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/time-marker/_layout.scss" as *; @mixin kendo-time-marker--layout() { @include kendo-time-marker--layout-base(); diff --git a/packages/bootstrap/scss/time-marker/_theme.scss b/packages/bootstrap/scss/time-marker/_theme.scss index 1fa9b7d5ae2..ee67a3852e9 100644 --- a/packages/bootstrap/scss/time-marker/_theme.scss +++ b/packages/bootstrap/scss/time-marker/_theme.scss @@ -1,5 +1,5 @@ @use "./variables.scss" as *; -@import "@progress/kendo-theme-default/scss/time-marker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/time-marker/_theme.scss" as *; @mixin kendo-time-marker--theme() { diff --git a/packages/bootstrap/scss/time-marker/_variables.scss b/packages/bootstrap/scss/time-marker/_variables.scss index da0464be8f0..0cc8e0213e3 100644 --- a/packages/bootstrap/scss/time-marker/_variables.scss +++ b/packages/bootstrap/scss/time-marker/_variables.scss @@ -4,3 +4,9 @@ $kendo-current-time-width: 1px !default; /// The color of the current time indicator. /// @group time-marker $kendo-current-time-color: #ff0000 !default; + + +@forward "@progress/kendo-theme-default/scss/time-marker/_variables.scss" with ( + $kendo-current-time-width: $kendo-current-time-width, + $kendo-current-time-color: $kendo-current-time-color +); diff --git a/packages/bootstrap/scss/timedurationpicker/_index.scss b/packages/bootstrap/scss/timedurationpicker/_index.scss index 9d1552c494a..674cb26be78 100644 --- a/packages/bootstrap/scss/timedurationpicker/_index.scss +++ b/packages/bootstrap/scss/timedurationpicker/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../icons/_index.scss" as *; @@ -12,10 +13,18 @@ @use "../list/_index.scss" as *; @use "../timeselector/_index.scss" as *; + // Expose -@mixin timedurationpicker-styles() { - @include import-once( "timedurationpicker" ) { - @include kendo-timedurationpicker--layout(); - @include kendo-timedurationpicker--theme(); +@mixin kendo-time-duration-picker--styles() { + @include import-once( "time-duration-picker" ) { + @include core-styles(); + @include kendo-icon--styles(); + @include kendo-button--styles(); + @include kendo-input--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-time-selector--styles(); + @include kendo-time-duration-picker--layout(); + @include kendo-time-duration-picker--theme(); } } diff --git a/packages/bootstrap/scss/timedurationpicker/_layout.scss b/packages/bootstrap/scss/timedurationpicker/_layout.scss index d7594157f18..19da028f479 100644 --- a/packages/bootstrap/scss/timedurationpicker/_layout.scss +++ b/packages/bootstrap/scss/timedurationpicker/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/timedurationpicker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/timedurationpicker/_layout.scss" as *; @mixin kendo-time-duration-picker--layout() { diff --git a/packages/bootstrap/scss/timedurationpicker/_theme.scss b/packages/bootstrap/scss/timedurationpicker/_theme.scss index 30b34525dab..1800f07127c 100644 --- a/packages/bootstrap/scss/timedurationpicker/_theme.scss +++ b/packages/bootstrap/scss/timedurationpicker/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/timedurationpicker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/timedurationpicker/_theme.scss" as *; @mixin kendo-time-duration-picker--theme() { diff --git a/packages/bootstrap/scss/timeline/_index.scss b/packages/bootstrap/scss/timeline/_index.scss index 5b38cc58cac..345bccd26df 100644 --- a/packages/bootstrap/scss/timeline/_index.scss +++ b/packages/bootstrap/scss/timeline/_index.scss @@ -3,15 +3,21 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @use "../card/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin timeline-styles() { +@mixin kendo-timeline--styles() { @include import-once( "timeline" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-card--styles(); + @include kendo-icon--styles(); @include kendo-timeline--layout(); @include kendo-timeline--theme(); } diff --git a/packages/bootstrap/scss/timeline/_layout.scss b/packages/bootstrap/scss/timeline/_layout.scss index 44089a0f38b..1aa811e2cf3 100644 --- a/packages/bootstrap/scss/timeline/_layout.scss +++ b/packages/bootstrap/scss/timeline/_layout.scss @@ -2,7 +2,7 @@ @use "./_variables.scss" as *; @use "../card/_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/timeline/_layout.scss"; +@use "@progress/kendo-theme-default/scss/timeline/_layout.scss" as *; @mixin kendo-timeline--layout() { diff --git a/packages/bootstrap/scss/timeline/_theme.scss b/packages/bootstrap/scss/timeline/_theme.scss index 5011dfe7bf8..170418829d2 100644 --- a/packages/bootstrap/scss/timeline/_theme.scss +++ b/packages/bootstrap/scss/timeline/_theme.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../card/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/timeline/_theme.scss"; +@use "@progress/kendo-theme-default/scss/timeline/_theme.scss" as *; @mixin kendo-timeline--theme() { diff --git a/packages/bootstrap/scss/timeline/_variables.scss b/packages/bootstrap/scss/timeline/_variables.scss index ccc77233491..8be0c73c512 100644 --- a/packages/bootstrap/scss/timeline/_variables.scss +++ b/packages/bootstrap/scss/timeline/_variables.scss @@ -1,6 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "../button/_variables.scss" as *; @use "../card/_variables.scss" as *; @@ -14,7 +14,7 @@ $kendo-timeline-spacing-x: k-spacing(10) !default; $kendo-timeline-spacing-y: k-spacing(10) !default; /// The padding between the Timeline's track items. /// @group timeline -$kendo-timeline-items-padding: $kendo-padding-md-x !default; +$kendo-timeline-items-padding: k-spacing(4) !default; /// The font family of the Timeline. /// @group timeline @@ -28,10 +28,10 @@ $kendo-timeline-line-height: var( --kendo-line-height, normal ) !default; /// The horizontal spacing of the mobile Timeline. /// @group timeline -$kendo-timeline-mobile-spacing-x: $kendo-padding-md-x !default; +$kendo-timeline-mobile-spacing-x: k-spacing(4) !default; /// The vertical spacing of the mobile Timeline. /// @group timeline -$kendo-timeline-mobile-spacing-y: $kendo-padding-md-x !default; +$kendo-timeline-mobile-spacing-y: k-spacing(4) !default; /// The width of the Timeline track arrow. /// @group timeline @@ -160,7 +160,7 @@ $kendo-timeline-circle-bg: $kendo-color-primary !default; /// The horizontal padding of the Timeline collapse arrow. /// @group timeline -$kendo-timeline-collapse-arrow-padding-x: $kendo-padding-sm-x !default; +$kendo-timeline-collapse-arrow-padding-x: k-spacing(2) !default; /// The width of the Timeline event. /// @group timeline @@ -171,3 +171,57 @@ $kendo-timeline-event-height: 600px !default; /// The minimum height of the Timeline event. /// @group timeline $kendo-timeline-event-min-height-calc: calc(2 * (#{$kendo-timeline-track-event-offset} - #{$kendo-card-border-width})) !default; + + +@forward "@progress/kendo-theme-default/scss/timeline/_variables.scss" with ( + $kendo-timeline-spacing-x: $kendo-timeline-spacing-x, + $kendo-timeline-spacing-y: $kendo-timeline-spacing-y, + $kendo-timeline-items-padding: $kendo-timeline-items-padding, + $kendo-timeline-font-family: $kendo-timeline-font-family, + $kendo-timeline-font-size: $kendo-timeline-font-size, + $kendo-timeline-line-height: $kendo-timeline-line-height, + $kendo-timeline-mobile-spacing-x: $kendo-timeline-mobile-spacing-x, + $kendo-timeline-mobile-spacing-y: $kendo-timeline-mobile-spacing-y, + $kendo-timeline-track-arrow-width: $kendo-timeline-track-arrow-width, + $kendo-timeline-track-arrow-height: $kendo-timeline-track-arrow-height, + $kendo-timeline-track-arrow-disabled-bg: $kendo-timeline-track-arrow-disabled-bg, + $kendo-timeline-track-arrow-disabled-text: $kendo-timeline-track-arrow-disabled-text, + $kendo-timeline-track-arrow-disabled-border: $kendo-timeline-track-arrow-disabled-border, + $kendo-timeline-track-size: $kendo-timeline-track-size, + $kendo-timeline-track-wrap-padding-bottom: $kendo-timeline-track-wrap-padding-bottom, + $kendo-timeline-track-border-width: $kendo-timeline-track-border-width, + $kendo-timeline-track-margin-bottom: $kendo-timeline-track-margin-bottom, + $kendo-timeline-track-bottom-calc: $kendo-timeline-track-bottom-calc, + $kendo-timeline-track-start-calc: $kendo-timeline-track-start-calc, + $kendo-timeline-track-end-calc: $kendo-timeline-track-end-calc, + $kendo-timeline-track-bg: $kendo-timeline-track-bg, + $kendo-timeline-track-border-color: $kendo-timeline-track-border-color, + $kendo-timeline-track-item-focus-shadow: $kendo-timeline-track-item-focus-shadow, + $kendo-timeline-track-event-offset: $kendo-timeline-track-event-offset, + $kendo-timeline-flag-padding-x: $kendo-timeline-flag-padding-x, + $kendo-timeline-flag-padding-y: $kendo-timeline-flag-padding-y, + $kendo-timeline-flag-line-height: $kendo-timeline-flag-line-height, + $kendo-timeline-flag-min-width: $kendo-timeline-flag-min-width, + $kendo-timeline-flag-max-width: $kendo-timeline-flag-max-width, + $kendo-timeline-mobile-flag-max-width: $kendo-timeline-mobile-flag-max-width, + $kendo-timeline-horizontal-flag-min-width: $kendo-timeline-horizontal-flag-min-width, + $kendo-timeline-flag-bg: $kendo-timeline-flag-bg, + $kendo-timeline-flag-text: $kendo-timeline-flag-text, + $kendo-timeline-flag-callout-width: $kendo-timeline-flag-callout-width, + $kendo-timeline-flag-callout-height: $kendo-timeline-flag-callout-height, + $kendo-timeline-flag-offset-bottom: $kendo-timeline-flag-offset-bottom, + $kendo-timeline-flag-margin-bottom-calc: $kendo-timeline-flag-margin-bottom-calc, + $kendo-timeline-date-width: $kendo-timeline-date-width, + $kendo-timeline-date-margin-bottom: $kendo-timeline-date-margin-bottom, + $kendo-timeline-vertical-padding-calc: $kendo-timeline-vertical-padding-calc, + $kendo-timeline-vertical-padding-with-dates-calc: $kendo-timeline-vertical-padding-with-dates-calc, + $kendo-timeline-mobile-vertical-padding-calc: $kendo-timeline-mobile-vertical-padding-calc, + $kendo-timeline-mobile-vertical-padding-with-dates-calc: $kendo-timeline-mobile-vertical-padding-with-dates-calc, + $kendo-timeline-circle-width: $kendo-timeline-circle-width, + $kendo-timeline-circle-height: $kendo-timeline-circle-height, + $kendo-timeline-circle-bg: $kendo-timeline-circle-bg, + $kendo-timeline-collapse-arrow-padding-x: $kendo-timeline-collapse-arrow-padding-x, + $kendo-timeline-event-width: $kendo-timeline-event-width, + $kendo-timeline-event-height: $kendo-timeline-event-height, + $kendo-timeline-event-min-height-calc: $kendo-timeline-event-min-height-calc +); diff --git a/packages/bootstrap/scss/timepicker/_index.scss b/packages/bootstrap/scss/timepicker/_index.scss index 46afc230810..0daf1dfb336 100644 --- a/packages/bootstrap/scss/timepicker/_index.scss +++ b/packages/bootstrap/scss/timepicker/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../input/_index.scss" as *; @@ -11,10 +12,17 @@ @use "../list/_index.scss" as *; @use "../timeselector/_index.scss" as *; + // Expose -@mixin timepicker-styles() { - @include import-once( "timepicker" ) { - @include kendo-timepicker--layout(); - @include kendo-timepicker--theme(); +@mixin kendo-time-picker--styles() { + @include import-once( "time-picker" ) { + @include core-styles(); + @include kendo-input--styles(); + @include kendo-button--styles(); + @include kendo-popup--styles(); + @include kendo-list--styles(); + @include kendo-time-selector--styles(); + @include kendo-time-picker--layout(); + @include kendo-time-picker--theme(); } } diff --git a/packages/bootstrap/scss/timepicker/_layout.scss b/packages/bootstrap/scss/timepicker/_layout.scss index 7a84dae436e..d6c8432ec86 100644 --- a/packages/bootstrap/scss/timepicker/_layout.scss +++ b/packages/bootstrap/scss/timepicker/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/timepicker/_layout.scss"; +@use "@progress/kendo-theme-default/scss/timepicker/_layout.scss" as *; @mixin kendo-time-picker--layout() { diff --git a/packages/bootstrap/scss/timepicker/_theme.scss b/packages/bootstrap/scss/timepicker/_theme.scss index 1b6db3adab8..346e9baedf2 100644 --- a/packages/bootstrap/scss/timepicker/_theme.scss +++ b/packages/bootstrap/scss/timepicker/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/timepicker/_theme.scss"; +@use "@progress/kendo-theme-default/scss/timepicker/_theme.scss" as *; @mixin kendo-time-picker--theme() { diff --git a/packages/bootstrap/scss/timeselector/_index.scss b/packages/bootstrap/scss/timeselector/_index.scss index 7779b491471..019e90087c4 100644 --- a/packages/bootstrap/scss/timeselector/_index.scss +++ b/packages/bootstrap/scss/timeselector/_index.scss @@ -3,16 +3,22 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../list/_index.scss" as *; @use "../action-buttons/_index.scss" as *; @use "../button/_index.scss" as *; + // Expose -@mixin timeselector-styles() { - @include import-once( "timeselector" ) { - @include kendo-timeselector--layout(); - @include kendo-timeselector--theme(); +@mixin kendo-time-selector--styles() { + @include import-once( "time-selector" ) { + @include core-styles(); + @include kendo-list--styles(); + @include kendo-action-buttons--styles(); + @include kendo-button--styles(); + @include kendo-time-selector--layout(); + @include kendo-time-selector--theme(); } } diff --git a/packages/bootstrap/scss/timeselector/_layout.scss b/packages/bootstrap/scss/timeselector/_layout.scss index 953fa2d73d2..8a0202bc8a6 100644 --- a/packages/bootstrap/scss/timeselector/_layout.scss +++ b/packages/bootstrap/scss/timeselector/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../button/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/timeselector/_layout.scss"; +@use "@progress/kendo-theme-default/scss/timeselector/_layout.scss" as *; @mixin kendo-time-selector--layout() { diff --git a/packages/bootstrap/scss/timeselector/_theme.scss b/packages/bootstrap/scss/timeselector/_theme.scss index 5fffc25f384..ce7fad3afec 100644 --- a/packages/bootstrap/scss/timeselector/_theme.scss +++ b/packages/bootstrap/scss/timeselector/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/timeselector/_theme.scss"; +@use "@progress/kendo-theme-default/scss/timeselector/_theme.scss" as *; @mixin kendo-time-selector--theme() { diff --git a/packages/bootstrap/scss/timeselector/_variables.scss b/packages/bootstrap/scss/timeselector/_variables.scss index f831cf87227..9b9176891d9 100644 --- a/packages/bootstrap/scss/timeselector/_variables.scss +++ b/packages/bootstrap/scss/timeselector/_variables.scss @@ -74,3 +74,44 @@ $kendo-time-selector-sizes: ( list-item-padding-y: $kendo-time-selector-lg-list-item-padding-y ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/timeselector/_variables.scss" with ( + $kendo-time-selector-border-width: $kendo-time-selector-border-width, + $kendo-time-selector-font-family: $kendo-time-selector-font-family, + $kendo-time-selector-font-size: $kendo-time-selector-font-size, + $kendo-time-selector-line-height: $kendo-time-selector-line-height, + $kendo-time-selector-bg: $kendo-time-selector-bg, + $kendo-time-selector-text: $kendo-time-selector-text, + $kendo-time-selector-border: $kendo-time-selector-border, + $kendo-time-selector-header-padding-x: $kendo-time-selector-header-padding-x, + $kendo-time-selector-header-padding-y: $kendo-time-selector-header-padding-y, + $kendo-time-selector-header-border-width: $kendo-time-selector-header-border-width, + $kendo-time-list-width: $kendo-time-list-width, + $kendo-time-list-height: $kendo-time-list-height, + $kendo-time-list-title-font-size: $kendo-time-list-title-font-size, + $kendo-time-list-title-line-height: $kendo-time-list-title-line-height, + $kendo-time-list-title-height: $kendo-time-list-title-height, + $kendo-time-list-title-text: $kendo-time-list-title-text, + $kendo-time-list-title-focus-text: $kendo-time-list-title-focus-text, + $kendo-time-list-item-padding-x: $kendo-time-list-item-padding-x, + $kendo-time-list-item-padding-y: $kendo-time-list-item-padding-y, + $kendo-time-list-highlight-border-width: $kendo-time-list-highlight-border-width, + $kendo-time-list-highlight-height: $kendo-time-list-highlight-height, + $kendo-time-list-highlight-bg: $kendo-time-list-highlight-bg, + $kendo-time-list-highlight-border: $kendo-time-list-highlight-border, + $kendo-time-list-focus-bg: $kendo-time-list-focus-bg, + $kendo-time-selector-sm-font-size: $kendo-time-selector-sm-font-size, + $kendo-time-selector-sm-line-height: $kendo-time-selector-sm-line-height, + $kendo-time-selector-sm-list-item-padding-x: $kendo-time-selector-sm-list-item-padding-x, + $kendo-time-selector-sm-list-item-padding-y: $kendo-time-selector-sm-list-item-padding-y, + $kendo-time-selector-md-font-size: $kendo-time-selector-md-font-size, + $kendo-time-selector-md-line-height: $kendo-time-selector-md-line-height, + $kendo-time-selector-md-list-item-padding-x: $kendo-time-selector-md-list-item-padding-x, + $kendo-time-selector-md-list-item-padding-y: $kendo-time-selector-md-list-item-padding-y, + $kendo-time-selector-lg-font-size: $kendo-time-selector-lg-font-size, + $kendo-time-selector-lg-line-height: $kendo-time-selector-lg-line-height, + $kendo-time-selector-lg-list-item-padding-x: $kendo-time-selector-lg-list-item-padding-x, + $kendo-time-selector-lg-list-item-padding-y: $kendo-time-selector-lg-list-item-padding-y, + $kendo-time-selector-sizes: $kendo-time-selector-sizes +); diff --git a/packages/bootstrap/scss/toolbar/_index.scss b/packages/bootstrap/scss/toolbar/_index.scss index 54faf5d95e3..91b80384e86 100644 --- a/packages/bootstrap/scss/toolbar/_index.scss +++ b/packages/bootstrap/scss/toolbar/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @@ -11,9 +12,15 @@ @use "../menu/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin toolbar-styles() { +@mixin kendo-toolbar--styles() { @include import-once( "toolbar" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-popup--styles(); + @include kendo-menu--styles(); + @include kendo-icon--styles(); @include kendo-toolbar--layout(); @include kendo-toolbar--theme(); @include kendo-utils--layout--overflow(); diff --git a/packages/bootstrap/scss/toolbar/_layout.scss b/packages/bootstrap/scss/toolbar/_layout.scss index 28afdeb09a1..b83cf2669bd 100644 --- a/packages/bootstrap/scss/toolbar/_layout.scss +++ b/packages/bootstrap/scss/toolbar/_layout.scss @@ -3,7 +3,7 @@ @use "../button/_variables.scss" as *; @use "../icon/_variables.scss" as *; @use "../menu/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/toolbar/_layout.scss"; +@use "@progress/kendo-theme-default/scss/toolbar/_layout.scss" as *; @mixin kendo-toolbar--layout() { diff --git a/packages/bootstrap/scss/toolbar/_theme.scss b/packages/bootstrap/scss/toolbar/_theme.scss index 0d18b9ebdb6..6277aa45a8e 100644 --- a/packages/bootstrap/scss/toolbar/_theme.scss +++ b/packages/bootstrap/scss/toolbar/_theme.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../menu/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/toolbar/_theme.scss"; +@use "@progress/kendo-theme-default/scss/toolbar/_theme.scss" as *; @mixin kendo-toolbar--theme() { diff --git a/packages/bootstrap/scss/toolbar/_variables.scss b/packages/bootstrap/scss/toolbar/_variables.scss index ae2f8763c8d..322104d3609 100644 --- a/packages/bootstrap/scss/toolbar/_variables.scss +++ b/packages/bootstrap/scss/toolbar/_variables.scss @@ -139,3 +139,43 @@ $kendo-toolbar-sizes: ( spacing: $kendo-toolbar-lg-spacing ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/toolbar/_variables.scss" with ( + $kendo-toolbar-padding-x: $kendo-toolbar-padding-x, + $kendo-toolbar-sm-padding-x: $kendo-toolbar-sm-padding-x, + $kendo-toolbar-md-padding-x: $kendo-toolbar-md-padding-x, + $kendo-toolbar-lg-padding-x: $kendo-toolbar-lg-padding-x, + $kendo-toolbar-padding-y: $kendo-toolbar-padding-y, + $kendo-toolbar-sm-padding-y: $kendo-toolbar-sm-padding-y, + $kendo-toolbar-md-padding-y: $kendo-toolbar-md-padding-y, + $kendo-toolbar-lg-padding-y: $kendo-toolbar-lg-padding-y, + $kendo-toolbar-spacing: $kendo-toolbar-spacing, + $kendo-toolbar-sm-spacing: $kendo-toolbar-sm-spacing, + $kendo-toolbar-md-spacing: $kendo-toolbar-md-spacing, + $kendo-toolbar-lg-spacing: $kendo-toolbar-lg-spacing, + $kendo-toolbar-border-width: $kendo-toolbar-border-width, + $kendo-toolbar-border-radius: $kendo-toolbar-border-radius, + $kendo-toolbar-font-family: $kendo-toolbar-font-family, + $kendo-toolbar-font-size: $kendo-toolbar-font-size, + $kendo-toolbar-line-height: $kendo-toolbar-line-height, + $kendo-toolbar-bg: $kendo-toolbar-bg, + $kendo-toolbar-text: $kendo-toolbar-text, + $kendo-toolbar-border: $kendo-toolbar-border, + $kendo-toolbar-gradient: $kendo-toolbar-gradient, + $kendo-toolbar-shadow: $kendo-toolbar-shadow, + $kendo-toolbar-outline-text: $kendo-toolbar-outline-text, + $kendo-toolbar-outline-border: $kendo-toolbar-outline-border, + $kendo-toolbar-outline-gradient: $kendo-toolbar-outline-gradient, + $kendo-toolbar-outline-shadow: $kendo-toolbar-outline-shadow, + $kendo-toolbar-outline-border-width: $kendo-toolbar-outline-border-width, + $kendo-toolbar-flat-text: $kendo-toolbar-flat-text, + $kendo-toolbar-flat-border: $kendo-toolbar-flat-border, + $kendo-toolbar-flat-gradient: $kendo-toolbar-flat-gradient, + $kendo-toolbar-flat-shadow: $kendo-toolbar-flat-shadow, + $kendo-toolbar-flat-border-width: $kendo-toolbar-flat-border-width, + $kendo-toolbar-separator-border: $kendo-toolbar-separator-border, + $kendo-toolbar-input-width: $kendo-toolbar-input-width, + $kendo-toolbar-item-shadow: $kendo-toolbar-item-shadow, + $kendo-toolbar-sizes: $kendo-toolbar-sizes +); diff --git a/packages/bootstrap/scss/tooltip/_functions.scss b/packages/bootstrap/scss/tooltip/_functions.scss new file mode 100644 index 00000000000..97718bb7e7e --- /dev/null +++ b/packages/bootstrap/scss/tooltip/_functions.scss @@ -0,0 +1,17 @@ +@use "sass:map"; +@use "../core/_index.scss" as *; +@use "../core/functions/index.import.scss" as *; + +@function tooltip-theme( $colors ) { + $_theme: (); + + @each $name, $color in $colors { + $_theme: map.merge(( $name: ( + color: if($kendo-enable-color-system, k-color( on-#{$name} ), k-contrast-legacy( $color )), + background-color: $color, + border: $color, + )), $_theme ); + } + + @return $_theme; +} diff --git a/packages/bootstrap/scss/tooltip/_index.scss b/packages/bootstrap/scss/tooltip/_index.scss index 5eab3d6d817..6fece2b55bd 100644 --- a/packages/bootstrap/scss/tooltip/_index.scss +++ b/packages/bootstrap/scss/tooltip/_index.scss @@ -3,15 +3,20 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; @use "../popup/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin tooltip-styles() { +@mixin kendo-tooltip--styles() { @include import-once( "tooltip" ) { + @include core-styles(); + @include kendo-popup--styles(); + @include kendo-icon--styles(); @include kendo-tooltip--layout(); @include kendo-tooltip--theme(); @include kendo-utils--typography--text-color(); diff --git a/packages/bootstrap/scss/tooltip/_layout.scss b/packages/bootstrap/scss/tooltip/_layout.scss index 724a86282e3..16213227c63 100644 --- a/packages/bootstrap/scss/tooltip/_layout.scss +++ b/packages/bootstrap/scss/tooltip/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "../icon/_variables.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/tooltip/_layout.scss"; +@use "@progress/kendo-theme-default/scss/tooltip/_layout.scss" as *; @mixin kendo-tooltip--layout() { diff --git a/packages/bootstrap/scss/tooltip/_theme.scss b/packages/bootstrap/scss/tooltip/_theme.scss index 220a3be69b5..79f463b8cfa 100644 --- a/packages/bootstrap/scss/tooltip/_theme.scss +++ b/packages/bootstrap/scss/tooltip/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/tooltip/_theme.scss"; +@use "@progress/kendo-theme-default/scss/tooltip/_theme.scss" as *; @mixin kendo-tooltip--theme() { diff --git a/packages/bootstrap/scss/tooltip/_variables.scss b/packages/bootstrap/scss/tooltip/_variables.scss index afa69dc6edd..0d50cf9d4bf 100644 --- a/packages/bootstrap/scss/tooltip/_variables.scss +++ b/packages/bootstrap/scss/tooltip/_variables.scss @@ -1,6 +1,6 @@ -@use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +@use "./_functions.scss" as *; +@use "bootstrap/scss/bootstrap.scss" as *; // Tooltip @@ -52,23 +52,29 @@ $kendo-tooltip-border: $kendo-tooltip-bg !default; /// @group tooltip $kendo-tooltip-shadow: k-elevation(2) !default; -@function tooltip-theme( $colors ) { - $_theme: (); - - @each $name, $color in $colors { - $_theme: k-map-merge(( $name: ( - color: if($kendo-enable-color-system, k-color( on-#{$name} ), k-contrast-legacy( $color )), - background-color: $color, - border: $color, - )), $_theme ); - } - - @return $_theme; -} - /// The theme colors map for the Tooltip. /// @group tooltip $kendo-tooltip-theme-colors: $kendo-theme-colors !default; /// The generated theme colors map for the Tooltip. /// @group tooltip $kendo-tooltip-theme: tooltip-theme( $kendo-tooltip-theme-colors ) !default; + + +@forward "@progress/kendo-theme-default/scss/tooltip/_variables.scss" with ( + $kendo-tooltip-padding-y: $kendo-tooltip-padding-y, + $kendo-tooltip-padding-x: $kendo-tooltip-padding-x, + $kendo-tooltip-border-width: $kendo-tooltip-border-width, + $kendo-tooltip-border-radius: $kendo-tooltip-border-radius, + $kendo-tooltip-font-family: $kendo-tooltip-font-family, + $kendo-tooltip-font-size: $kendo-tooltip-font-size, + $kendo-tooltip-line-height: $kendo-tooltip-line-height, + $kendo-tooltip-title-font-size: $kendo-tooltip-title-font-size, + $kendo-tooltip-title-line-height: $kendo-tooltip-title-line-height, + $kendo-tooltip-callout-size: $kendo-tooltip-callout-size, + $kendo-tooltip-bg: $kendo-tooltip-bg, + $kendo-tooltip-text: $kendo-tooltip-text, + $kendo-tooltip-border: $kendo-tooltip-border, + $kendo-tooltip-shadow: $kendo-tooltip-shadow, + $kendo-tooltip-theme-colors: $kendo-tooltip-theme-colors, + $kendo-tooltip-theme: $kendo-tooltip-theme +); diff --git a/packages/bootstrap/scss/treelist/_index.scss b/packages/bootstrap/scss/treelist/_index.scss index 1abe2253df7..4dbe6e64ea7 100644 --- a/packages/bootstrap/scss/treelist/_index.scss +++ b/packages/bootstrap/scss/treelist/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../grid/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin treelist-styles() { +@mixin kendo-treelist--styles() { @include import-once( "treelist" ) { + @include core-styles(); + @include kendo-grid--styles(); + @include kendo-icon--styles(); @include kendo-treelist--layout(); @include kendo-treelist--theme(); } diff --git a/packages/bootstrap/scss/treelist/_layout.scss b/packages/bootstrap/scss/treelist/_layout.scss index 28b3d899051..d51b4cf9225 100644 --- a/packages/bootstrap/scss/treelist/_layout.scss +++ b/packages/bootstrap/scss/treelist/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/treelist/_layout.scss"; +@use "@progress/kendo-theme-default/scss/treelist/_layout.scss" as *; @mixin kendo-treelist--layout() { diff --git a/packages/bootstrap/scss/treelist/_theme.scss b/packages/bootstrap/scss/treelist/_theme.scss index c5735e7a73b..cd24b3b0432 100644 --- a/packages/bootstrap/scss/treelist/_theme.scss +++ b/packages/bootstrap/scss/treelist/_theme.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/treelist/_theme.scss"; +@use "@progress/kendo-theme-default/scss/treelist/_theme.scss" as *; @mixin kendo-treelist--theme() { diff --git a/packages/bootstrap/scss/treelist/_variables.scss b/packages/bootstrap/scss/treelist/_variables.scss index 9424899ac15..045cf04ad69 100644 --- a/packages/bootstrap/scss/treelist/_variables.scss +++ b/packages/bootstrap/scss/treelist/_variables.scss @@ -10,3 +10,9 @@ $kendo-treelist-footer-row-bg: $kendo-grid-header-bg !default; /// The border width of the TreeList footer row. /// @group treelist $kendo-treelist-footer-row-border-width: 1px !default; + + +@forward "@progress/kendo-theme-default/scss/treelist/_variables.scss" with ( + $kendo-treelist-footer-row-bg: $kendo-treelist-footer-row-bg, + $kendo-treelist-footer-row-border-width: $kendo-treelist-footer-row-border-width +); diff --git a/packages/bootstrap/scss/treeview/_index.scss b/packages/bootstrap/scss/treeview/_index.scss index 506fa6937ed..e7007705516 100644 --- a/packages/bootstrap/scss/treeview/_index.scss +++ b/packages/bootstrap/scss/treeview/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../checkbox/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin treeview-styles() { +@mixin kendo-treeview--styles() { @include import-once( "treeview" ) { + @include core-styles(); + @include kendo-checkbox--styles(); + @include kendo-icon--styles(); @include kendo-treeview--layout(); @include kendo-treeview--theme(); } diff --git a/packages/bootstrap/scss/treeview/_layout.scss b/packages/bootstrap/scss/treeview/_layout.scss index 5799bf9230e..abae7f815ea 100644 --- a/packages/bootstrap/scss/treeview/_layout.scss +++ b/packages/bootstrap/scss/treeview/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; @use "../icon/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/treeview/_layout.scss"; +@use "@progress/kendo-theme-default/scss/treeview/_layout.scss" as *; @mixin kendo-treeview--layout() { diff --git a/packages/bootstrap/scss/treeview/_theme.scss b/packages/bootstrap/scss/treeview/_theme.scss index 19a7ba35feb..12d81b09a1b 100644 --- a/packages/bootstrap/scss/treeview/_theme.scss +++ b/packages/bootstrap/scss/treeview/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/treeview/_theme.scss"; +@use "@progress/kendo-theme-default/scss/treeview/_theme.scss" as *; @mixin kendo-treeview--theme() { diff --git a/packages/bootstrap/scss/treeview/_variables.scss b/packages/bootstrap/scss/treeview/_variables.scss index 88236bfb82e..eae32e3b873 100644 --- a/packages/bootstrap/scss/treeview/_variables.scss +++ b/packages/bootstrap/scss/treeview/_variables.scss @@ -189,3 +189,56 @@ $kendo-treeview-loadmore-focus-border: null !default; /// @group treeview $kendo-treeview-loadmore-focus-shadow: $kendo-treeview-item-focus-shadow !default; + + +@forward "@progress/kendo-theme-default/scss/treeview/_variables.scss" with ( + $kendo-treeview-font-family: $kendo-treeview-font-family, + $kendo-treeview-font-size: $kendo-treeview-font-size, + $kendo-treeview-sm-font-size: $kendo-treeview-sm-font-size, + $kendo-treeview-md-font-size: $kendo-treeview-md-font-size, + $kendo-treeview-lg-font-size: $kendo-treeview-lg-font-size, + $kendo-treeview-line-height: $kendo-treeview-line-height, + $kendo-treeview-sm-line-height: $kendo-treeview-sm-line-height, + $kendo-treeview-md-line-height: $kendo-treeview-md-line-height, + $kendo-treeview-lg-line-height: $kendo-treeview-lg-line-height, + $kendo-treeview-indent: $kendo-treeview-indent, + $kendo-treeview-item-padding-x: $kendo-treeview-item-padding-x, + $kendo-treeview-sm-item-padding-x: $kendo-treeview-sm-item-padding-x, + $kendo-treeview-md-item-padding-x: $kendo-treeview-md-item-padding-x, + $kendo-treeview-lg-item-padding-x: $kendo-treeview-lg-item-padding-x, + $kendo-treeview-item-padding-y: $kendo-treeview-item-padding-y, + $kendo-treeview-sm-item-padding-y: $kendo-treeview-sm-item-padding-y, + $kendo-treeview-md-item-padding-y: $kendo-treeview-md-item-padding-y, + $kendo-treeview-lg-item-padding-y: $kendo-treeview-lg-item-padding-y, + $kendo-treeview-item-border-width: $kendo-treeview-item-border-width, + $kendo-treeview-item-border-radius: $kendo-treeview-item-border-radius, + $kendo-treeview-sm-checkbox-padding-x: $kendo-treeview-sm-checkbox-padding-x, + $kendo-treeview-md-checkbox-padding-x: $kendo-treeview-md-checkbox-padding-x, + $kendo-treeview-lg-checkbox-padding-x: $kendo-treeview-lg-checkbox-padding-x, + $kendo-treeview-sm-checkbox-padding-y: $kendo-treeview-sm-checkbox-padding-y, + $kendo-treeview-md-checkbox-padding-y: $kendo-treeview-md-checkbox-padding-y, + $kendo-treeview-lg-checkbox-padding-y: $kendo-treeview-lg-checkbox-padding-y, + $kendo-treeview-sizes: $kendo-treeview-sizes, + $kendo-treeview-bg: $kendo-treeview-bg, + $kendo-treeview-text: $kendo-treeview-text, + $kendo-treeview-border: $kendo-treeview-border, + $kendo-treeview-item-hover-bg: $kendo-treeview-item-hover-bg, + $kendo-treeview-item-hover-text: $kendo-treeview-item-hover-text, + $kendo-treeview-item-hover-border: $kendo-treeview-item-hover-border, + $kendo-treeview-item-hover-gradient: $kendo-treeview-item-hover-gradient, + $kendo-treeview-item-selected-bg: $kendo-treeview-item-selected-bg, + $kendo-treeview-item-selected-text: $kendo-treeview-item-selected-text, + $kendo-treeview-item-selected-border: $kendo-treeview-item-selected-border, + $kendo-treeview-item-selected-gradient: $kendo-treeview-item-selected-gradient, + $kendo-treeview-item-focus-shadow: $kendo-treeview-item-focus-shadow, + $kendo-treeview-loadmore-bg: $kendo-treeview-loadmore-bg, + $kendo-treeview-loadmore-text: $kendo-treeview-loadmore-text, + $kendo-treeview-loadmore-border: $kendo-treeview-loadmore-border, + $kendo-treeview-loadmore-hover-bg: $kendo-treeview-loadmore-hover-bg, + $kendo-treeview-loadmore-hover-text: $kendo-treeview-loadmore-hover-text, + $kendo-treeview-loadmore-hover-border: $kendo-treeview-loadmore-hover-border, + $kendo-treeview-loadmore-focus-bg: $kendo-treeview-loadmore-focus-bg, + $kendo-treeview-loadmore-focus-text: $kendo-treeview-loadmore-focus-text, + $kendo-treeview-loadmore-focus-border: $kendo-treeview-loadmore-focus-border, + $kendo-treeview-loadmore-focus-shadow: $kendo-treeview-loadmore-focus-shadow +); diff --git a/packages/bootstrap/scss/typography/_index.scss b/packages/bootstrap/scss/typography/_index.scss index 6797a1b413a..db7e12d2769 100644 --- a/packages/bootstrap/scss/typography/_index.scss +++ b/packages/bootstrap/scss/typography/_index.scss @@ -3,13 +3,16 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../utils/_index.scss" as *; + // Expose -@mixin typography-styles() { +@mixin typography--styles() { @include import-once( "typography" ) { + @include core-styles(); @include kendo-typography--layout(); @include kendo-typography--theme(); @include kendo-utils--spacing--margin(); diff --git a/packages/bootstrap/scss/typography/_layout.scss b/packages/bootstrap/scss/typography/_layout.scss index f765f4985fd..5c6c986b306 100644 --- a/packages/bootstrap/scss/typography/_layout.scss +++ b/packages/bootstrap/scss/typography/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/typography/_layout.scss"; +@use "@progress/kendo-theme-default/scss/typography/_layout.scss" as *; @mixin kendo-typography--layout() { diff --git a/packages/bootstrap/scss/typography/_theme.scss b/packages/bootstrap/scss/typography/_theme.scss index dcfce91d7b8..439af9ebda4 100644 --- a/packages/bootstrap/scss/typography/_theme.scss +++ b/packages/bootstrap/scss/typography/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/typography/_theme.scss"; +@use "@progress/kendo-theme-default/scss/typography/_theme.scss" as *; @mixin kendo-typography--theme() { diff --git a/packages/bootstrap/scss/typography/_variables.scss b/packages/bootstrap/scss/typography/_variables.scss index 808bc77544b..f5d963d4e13 100644 --- a/packages/bootstrap/scss/typography/_variables.scss +++ b/packages/bootstrap/scss/typography/_variables.scss @@ -343,3 +343,84 @@ $kendo-display: ( letter-spacing: $kendo-display4-letter-spacing ) ) !default; + + +@forward "@progress/kendo-theme-default/scss/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 +); diff --git a/packages/bootstrap/scss/upload/_index.scss b/packages/bootstrap/scss/upload/_index.scss index d3421713709..99059479e06 100644 --- a/packages/bootstrap/scss/upload/_index.scss +++ b/packages/bootstrap/scss/upload/_index.scss @@ -3,6 +3,7 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../button/_index.scss" as *; @@ -10,9 +11,15 @@ @use "../icons/_index.scss" as *; @use "../dropzone/_index.scss" as *; + // Expose -@mixin upload-styles() { +@mixin kendo-upload--styles() { @include import-once( "upload" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-action-buttons--styles(); + @include kendo-icon--styles(); + @include kendo-dropzone--styles(); @include kendo-upload--layout(); @include kendo-upload--theme(); } diff --git a/packages/bootstrap/scss/upload/_layout.scss b/packages/bootstrap/scss/upload/_layout.scss index 62dff095131..df14dbb4d0d 100644 --- a/packages/bootstrap/scss/upload/_layout.scss +++ b/packages/bootstrap/scss/upload/_layout.scss @@ -1,7 +1,7 @@ @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/upload/_layout.scss"; +@use "@progress/kendo-theme-default/scss/upload/_layout.scss" as *; @mixin kendo-upload--layout() { diff --git a/packages/bootstrap/scss/upload/_theme.scss b/packages/bootstrap/scss/upload/_theme.scss index e8e6c704b59..6cc50dfdc77 100644 --- a/packages/bootstrap/scss/upload/_theme.scss +++ b/packages/bootstrap/scss/upload/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/upload/_theme.scss"; +@use "@progress/kendo-theme-default/scss/upload/_theme.scss" as *; @mixin kendo-upload--theme() { diff --git a/packages/bootstrap/scss/upload/_variables.scss b/packages/bootstrap/scss/upload/_variables.scss index ef2c7ec7159..de90f63ed31 100644 --- a/packages/bootstrap/scss/upload/_variables.scss +++ b/packages/bootstrap/scss/upload/_variables.scss @@ -1,6 +1,6 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; @use "../icon/_variables.scss" as *; // Upload @@ -105,3 +105,37 @@ $kendo-upload-error-bg: $kendo-color-error !default; /// The shadow of the focused Upload button, actions and uploaded items. /// @group upload $kendo-upload-focus-shadow: 0 0 0 2px rgba(0, 0, 0, .13) !default; + + +@forward "@progress/kendo-theme-default/scss/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 +); diff --git a/packages/bootstrap/scss/utils/_index.scss b/packages/bootstrap/scss/utils/_index.scss index cd33cc4ad16..cc02caddfc1 100644 --- a/packages/bootstrap/scss/utils/_index.scss +++ b/packages/bootstrap/scss/utils/_index.scss @@ -1,10 +1 @@ -@use "../core/_index.scss" as *; - -@forward "@progress/kendo-theme-utils/scss/index.import.scss" with ( - $kendo-spacing: $kendo-spacing, - $kendo-font-sizes: $kendo-font-sizes, - $kendo-border-radii: $kendo-border-radii, - $kendo-elevation: $kendo-elevation, - $kendo-colors: $kendo-colors, - $kendo-enable-color-system: $kendo-enable-color-system -); +@forward "@progress/kendo-theme-utils/scss/index.import.scss"; diff --git a/packages/bootstrap/scss/validator/_index.scss b/packages/bootstrap/scss/validator/_index.scss index 7ae29f65256..51cab62d7a6 100644 --- a/packages/bootstrap/scss/validator/_index.scss +++ b/packages/bootstrap/scss/validator/_index.scss @@ -3,14 +3,19 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies @use "../core/_index.scss" as *; @use "../tooltip/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin validator-styles() { +@mixin kendo-validator--styles() { @include import-once( "validator" ) { + @include core-styles(); + @include kendo-tooltip--styles(); + @include kendo-icon--styles(); @include kendo-validator--layout(); @include kendo-validator--theme(); } diff --git a/packages/bootstrap/scss/validator/_layout.scss b/packages/bootstrap/scss/validator/_layout.scss index d7023f94d12..f8bd420eea8 100644 --- a/packages/bootstrap/scss/validator/_layout.scss +++ b/packages/bootstrap/scss/validator/_layout.scss @@ -1,5 +1,5 @@ @use "../tooltip/_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/validator/_layout.scss"; +@use "@progress/kendo-theme-default/scss/validator/_layout.scss" as *; @mixin kendo-validator--layout() { diff --git a/packages/bootstrap/scss/validator/_theme.scss b/packages/bootstrap/scss/validator/_theme.scss index 0271748ea44..551b8847229 100644 --- a/packages/bootstrap/scss/validator/_theme.scss +++ b/packages/bootstrap/scss/validator/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/validator/_theme.scss"; +@use "@progress/kendo-theme-default/scss/validator/_theme.scss" as *; @mixin kendo-validator--theme() { diff --git a/packages/bootstrap/scss/virtual-scroller/_index.scss b/packages/bootstrap/scss/virtual-scroller/_index.scss index a8eea025ecb..34ddc9cc8b2 100644 --- a/packages/bootstrap/scss/virtual-scroller/_index.scss +++ b/packages/bootstrap/scss/virtual-scroller/_index.scss @@ -7,9 +7,11 @@ // Dependencies @use "../core/_index.scss" as *; + // Expose -@mixin virtual-scroller-styles() { +@mixin kendo-virtual-scroller--styles() { @include import-once( "virtual-scroller" ) { + @include core-styles(); @include kendo-virtual-scroller--layout(); @include kendo-virtual-scroller--theme(); } diff --git a/packages/bootstrap/scss/virtual-scroller/_layout.scss b/packages/bootstrap/scss/virtual-scroller/_layout.scss index d7c1418bdb0..5820dd6a56e 100644 --- a/packages/bootstrap/scss/virtual-scroller/_layout.scss +++ b/packages/bootstrap/scss/virtual-scroller/_layout.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/virtual-scroller/_layout.scss"; +@use "@progress/kendo-theme-default/scss/virtual-scroller/_layout.scss" as *; @mixin kendo-virtual-scroller--layout() { diff --git a/packages/bootstrap/scss/virtual-scroller/_theme.scss b/packages/bootstrap/scss/virtual-scroller/_theme.scss index cdb2460fe47..1a35213cb4f 100644 --- a/packages/bootstrap/scss/virtual-scroller/_theme.scss +++ b/packages/bootstrap/scss/virtual-scroller/_theme.scss @@ -1,4 +1,4 @@ -@import "@progress/kendo-theme-default/scss/virtual-scroller/_theme.scss"; +@use "@progress/kendo-theme-default/scss/virtual-scroller/_theme.scss" as *; @mixin kendo-virtual-scroller--theme() { diff --git a/packages/bootstrap/scss/window/_index.scss b/packages/bootstrap/scss/window/_index.scss index b97ecc7ed6c..0b2cf11ad43 100644 --- a/packages/bootstrap/scss/window/_index.scss +++ b/packages/bootstrap/scss/window/_index.scss @@ -12,9 +12,16 @@ @use "../action-buttons/_index.scss" as *; @use "../icons/_index.scss" as *; + // Expose -@mixin window-styles() { +@mixin kendo-window--styles() { @include import-once( "window" ) { + @include core-styles(); + @include kendo-overlay--styles(); + @include kendo-form--styles(); + @include kendo-button--styles(); + @include kendo-action-buttons--styles(); + @include kendo-icon--styles(); @include kendo-window--layout(); @include kendo-window--theme(); } diff --git a/packages/bootstrap/scss/window/_layout.scss b/packages/bootstrap/scss/window/_layout.scss index 068baf761b8..93ff353dfda 100644 --- a/packages/bootstrap/scss/window/_layout.scss +++ b/packages/bootstrap/scss/window/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/window/_layout.scss"; +@use "@progress/kendo-theme-default/scss/window/_layout.scss" as *; @mixin kendo-window--layout() { diff --git a/packages/bootstrap/scss/window/_theme.scss b/packages/bootstrap/scss/window/_theme.scss index e2be505f5d7..cabf53207be 100644 --- a/packages/bootstrap/scss/window/_theme.scss +++ b/packages/bootstrap/scss/window/_theme.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/window/_theme.scss"; +@use "@progress/kendo-theme-default/scss/window/_theme.scss" as *; @mixin kendo-window--theme() { diff --git a/packages/bootstrap/scss/window/_variables.scss b/packages/bootstrap/scss/window/_variables.scss index 2f41e8cf765..ff63da14192 100644 --- a/packages/bootstrap/scss/window/_variables.scss +++ b/packages/bootstrap/scss/window/_variables.scss @@ -1,5 +1,5 @@ -// @use "sass:map"; -// @use "../core/_index.scss" as *; +@use "sass:map"; +@use "../core/_index.scss" as *; @use "../action-buttons/_variables.scss" as *; // Window @@ -107,7 +107,41 @@ $kendo-window-sizes: ( /// The theme colors map for the Window. /// @group window $kendo-window-theme-colors: ( - "primary": k-map-get($kendo-theme-colors, "primary"), - "light": k-map-get($kendo-theme-colors, "light"), - "dark": k-map-get($kendo-theme-colors, "dark") + "primary": map.get($kendo-theme-colors, "primary"), + "light": map.get($kendo-theme-colors, "light"), + "dark": map.get($kendo-theme-colors, "dark") ) !default; + + +@forward "@progress/kendo-theme-default/scss/window/_variables.scss" with ( + $kendo-window-border-width: $kendo-window-border-width, + $kendo-window-border-radius: $kendo-window-border-radius, + $kendo-window-font-family: $kendo-window-font-family, + $kendo-window-font-size: $kendo-window-font-size, + $kendo-window-line-height: $kendo-window-line-height, + $kendo-window-titlebar-padding-x: $kendo-window-titlebar-padding-x, + $kendo-window-titlebar-padding-y: $kendo-window-titlebar-padding-y, + $kendo-window-titlebar-border-width: $kendo-window-titlebar-border-width, + $kendo-window-titlebar-border-style: $kendo-window-titlebar-border-style, + $kendo-window-title-font-size: $kendo-window-title-font-size, + $kendo-window-title-line-height: $kendo-window-title-line-height, + $kendo-window-actions-gap: $kendo-window-actions-gap, + $kendo-window-action-opacity: $kendo-window-action-opacity, + $kendo-window-action-hover-opacity: $kendo-window-action-hover-opacity, + $kendo-window-inner-padding-x: $kendo-window-inner-padding-x, + $kendo-window-inner-padding-y: $kendo-window-inner-padding-y, + $kendo-window-buttongroup-padding-x: $kendo-window-buttongroup-padding-x, + $kendo-window-buttongroup-padding-y: $kendo-window-buttongroup-padding-y, + $kendo-window-buttongroup-border-width: $kendo-window-buttongroup-border-width, + $kendo-window-bg: $kendo-window-bg, + $kendo-window-text: $kendo-window-text, + $kendo-window-border: $kendo-window-border, + $kendo-window-shadow: $kendo-window-shadow, + $kendo-window-focus-shadow: $kendo-window-focus-shadow, + $kendo-window-titlebar-bg: $kendo-window-titlebar-bg, + $kendo-window-titlebar-text: $kendo-window-titlebar-text, + $kendo-window-titlebar-border: $kendo-window-titlebar-border, + $kendo-window-titlebar-gradient: $kendo-window-titlebar-gradient, + $kendo-window-sizes: $kendo-window-sizes, + $kendo-window-theme-colors: $kendo-window-theme-colors +); diff --git a/packages/bootstrap/scss/wizard/_index.scss b/packages/bootstrap/scss/wizard/_index.scss index 393af191da6..3b511cbfb69 100644 --- a/packages/bootstrap/scss/wizard/_index.scss +++ b/packages/bootstrap/scss/wizard/_index.scss @@ -3,15 +3,23 @@ @use "./_layout.scss" as *; @use "./_theme.scss" as *; + // Dependencies -@use "../button/_index.scss"; -@use "../stepper/_index.scss"; -@use "../forms/_index.scss"; -@use "../icons/_index.scss"; +@use "../core/_index.scss" as *; +@use "../button/_index.scss" as *; +@use "../stepper/_index.scss" as *; +@use "../forms/_index.scss" as *; +@use "../icons/_index.scss" as *; + // Expose -@mixin wizard-styles() { +@mixin kendo-wizard--styles() { @include import-once( "wizard" ) { + @include core-styles(); + @include kendo-button--styles(); + @include kendo-stepper--styles(); + @include kendo-form--styles(); + @include kendo-icon--styles(); @include kendo-wizard--layout(); @include kendo-wizard--theme(); } diff --git a/packages/bootstrap/scss/wizard/_layout.scss b/packages/bootstrap/scss/wizard/_layout.scss index 7329b26529c..3e428eaaf3f 100644 --- a/packages/bootstrap/scss/wizard/_layout.scss +++ b/packages/bootstrap/scss/wizard/_layout.scss @@ -1,6 +1,6 @@ @use "../core/_index.scss" as *; @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/wizard/_layout.scss"; +@use "@progress/kendo-theme-default/scss/wizard/_layout.scss" as *; @mixin kendo-wizard--layout() { diff --git a/packages/bootstrap/scss/wizard/_theme.scss b/packages/bootstrap/scss/wizard/_theme.scss index acdafeec7d8..79caad9c031 100644 --- a/packages/bootstrap/scss/wizard/_theme.scss +++ b/packages/bootstrap/scss/wizard/_theme.scss @@ -1,5 +1,5 @@ @use "./_variables.scss" as *; -@import "@progress/kendo-theme-default/scss/wizard/_theme.scss"; +@use "@progress/kendo-theme-default/scss/wizard/_theme.scss" as *; @mixin kendo-wizard--theme() { diff --git a/packages/bootstrap/scss/wizard/_variables.scss b/packages/bootstrap/scss/wizard/_variables.scss index 2ba750ea877..6bd2ff25f63 100644 --- a/packages/bootstrap/scss/wizard/_variables.scss +++ b/packages/bootstrap/scss/wizard/_variables.scss @@ -1,21 +1,21 @@ @use "sass:map"; @use "../core/_index.scss" as *; -@use "../core/spacing/_index.scss" as *; +// @use "../core/spacing/_index.scss" as *; // Wizard /// The horizontal padding of the Wizard. /// @group wizard -$kendo-wizard-padding-x: calc( #{$kendo-padding-md-x} * 1.25 ) !default; +$kendo-wizard-padding-x: calc( #{k-spacing(4)} * 1.25 ) !default; /// The vertical padding of the Wizard. /// @group wizard $kendo-wizard-padding-y: $kendo-wizard-padding-x !default; /// The horizontal padding of the Wizard content. /// @group wizard -$kendo-wizard-content-padding-x: calc( #{$kendo-padding-md-x} * 2 ) !default; +$kendo-wizard-content-padding-x: calc( #{k-spacing(4)} * 2 ) !default; /// The vertical padding of the Wizard content. /// @group wizard -$kendo-wizard-content-padding-y: calc( #{$kendo-padding-md-y} * 4 ) !default; +$kendo-wizard-content-padding-y: calc( #{k-spacing(2)} * 4 ) !default; /// The horizontal margin of the Wizard's Button container. /// @group wizard $kendo-wizard-buttons-margin-x: k-spacing(2.5) !default; @@ -36,3 +36,17 @@ $kendo-wizard-font-family: var( --kendo-font-family, inherit ) !default; /// The outline of the focused Wizard step. /// @group wizard $kendo-wizard-step-focus-border: #656565 !default; + + +@forward "@progress/kendo-theme-default/scss/wizard/_variables.scss" with ( + $kendo-wizard-padding-x: $kendo-wizard-padding-x, + $kendo-wizard-padding-y: $kendo-wizard-padding-y, + $kendo-wizard-content-padding-x: $kendo-wizard-content-padding-x, + $kendo-wizard-content-padding-y: $kendo-wizard-content-padding-y, + $kendo-wizard-buttons-margin-x: $kendo-wizard-buttons-margin-x, + $kendo-wizard-border-width: $kendo-wizard-border-width, + $kendo-wizard-font-size: $kendo-wizard-font-size, + $kendo-wizard-line-height: $kendo-wizard-line-height, + $kendo-wizard-font-family: $kendo-wizard-font-family, + $kendo-wizard-step-focus-border: $kendo-wizard-step-focus-border +);