From 7cc4570484512a6dcd67b83a1fee083fa399ce0e Mon Sep 17 00:00:00 2001 From: joneff Date: Thu, 24 Sep 2020 23:40:44 +0300 Subject: [PATCH] fix(numeric): extract numeric textbox variables into separate files --- packages/bootstrap/scss/_variables.scss | 37 ------------------- .../bootstrap/scss/numerictextbox/_index.scss | 2 + .../scss/numerictextbox/_variables.scss | 35 ++++++++++++++++++ packages/classic/scss/_variables.scss | 37 ------------------- .../classic/scss/numerictextbox/_index.scss | 1 + .../scss/numerictextbox/_variables.scss | 35 ++++++++++++++++++ packages/default/scss/_variables.scss | 37 ------------------- .../default/scss/numerictextbox/_index.scss | 2 + .../scss/numerictextbox/_variables.scss | 35 ++++++++++++++++++ packages/material/scss/_variables.scss | 37 ------------------- .../material/scss/numerictextbox/_index.scss | 2 + .../scss/numerictextbox/_variables.scss | 35 ++++++++++++++++++ 12 files changed, 147 insertions(+), 148 deletions(-) create mode 100644 packages/bootstrap/scss/numerictextbox/_variables.scss create mode 100644 packages/classic/scss/numerictextbox/_variables.scss create mode 100644 packages/default/scss/numerictextbox/_variables.scss create mode 100644 packages/material/scss/numerictextbox/_variables.scss diff --git a/packages/bootstrap/scss/_variables.scss b/packages/bootstrap/scss/_variables.scss index d5ce673040e..dd4554372b6 100644 --- a/packages/bootstrap/scss/_variables.scss +++ b/packages/bootstrap/scss/_variables.scss @@ -795,43 +795,6 @@ $popup-border: $dropdown-border-color !default; $popup-shadow: 0 2px 4px 0 rgba(0, 0, 0, .03), 0 4px 5px 0 rgba(0, 0, 0, .04) !default; -// NumericTextBox -$numerictextbox-spinners-focused-shadow: null !default; - -$numeric-bg: $input-bg !default; -$numeric-text: $input-text !default; -$numeric-border: $input-border !default; - -$numeric-hovered-bg: $input-hovered-bg !default; -$numeric-hovered-text: $input-hovered-text !default; -$numeric-hovered-border: $input-hovered-border !default; - -$numeric-focused-bg: $input-focused-bg !default; -$numeric-focused-text: $input-focused-text !default; -$numeric-focused-border: $input-focused-border !default; -$numeric-focused-shadow: $input-focused-shadow !default; - -$numeric-invalid-bg: null !default; -$numeric-invalid-text: $error !default; -$numeric-invalid-border: $invalid-border !default; - -$numeric-button-bg: $button-bg !default; -$numeric-button-text: $button-text !default; -$numeric-button-border: $button-border !default; -$numeric-button-gradient: $button-gradient !default; - -$numeric-button-hovered-bg: $button-hovered-bg !default; -$numeric-button-hovered-text: $button-hovered-text !default; -$numeric-button-hovered-border: $button-hovered-border !default; -$numeric-button-hovered-gradient: $button-hovered-gradient !default; - -$numeric-button-pressed-text: $button-pressed-text !default; -$numeric-button-pressed-bg: $button-pressed-bg !default; -$numeric-button-pressed-border: $button-pressed-border !default; -$numeric-button-pressed-gradient: $button-pressed-gradient !default; -$numeric-button-pressed-shadow: $button-pressed-shadow !default; - - $spinner-width: $button-inner-calc-size !default; $spinner-icon-offset: 1px !default; diff --git a/packages/bootstrap/scss/numerictextbox/_index.scss b/packages/bootstrap/scss/numerictextbox/_index.scss index 04768b46ac3..d988d2adf5e 100644 --- a/packages/bootstrap/scss/numerictextbox/_index.scss +++ b/packages/bootstrap/scss/numerictextbox/_index.scss @@ -5,9 +5,11 @@ // Dependencies @import "../common/_index.scss"; @import "../input/_index.scss"; +@import "../floating-label/_index.scss"; @import "../icons/_index.scss"; // Component +@import "_variables.scss"; @import "_layout.scss"; @import "_theme.scss"; diff --git a/packages/bootstrap/scss/numerictextbox/_variables.scss b/packages/bootstrap/scss/numerictextbox/_variables.scss new file mode 100644 index 00000000000..a49177d283d --- /dev/null +++ b/packages/bootstrap/scss/numerictextbox/_variables.scss @@ -0,0 +1,35 @@ +// Numeric textbox +$numerictextbox-spinners-focused-shadow: null !default; + +$numeric-bg: $input-bg !default; +$numeric-text: $input-text !default; +$numeric-border: $input-border !default; + +$numeric-hovered-bg: $input-hovered-bg !default; +$numeric-hovered-text: $input-hovered-text !default; +$numeric-hovered-border: $input-hovered-border !default; + +$numeric-focused-bg: $input-focused-bg !default; +$numeric-focused-text: $input-focused-text !default; +$numeric-focused-border: $input-focused-border !default; +$numeric-focused-shadow: $input-focused-shadow !default; + +$numeric-invalid-bg: null !default; +$numeric-invalid-text: $error !default; +$numeric-invalid-border: $invalid-border !default; + +$numeric-button-bg: $button-bg !default; +$numeric-button-text: $button-text !default; +$numeric-button-border: $button-border !default; +$numeric-button-gradient: $button-gradient !default; + +$numeric-button-hovered-bg: $button-hovered-bg !default; +$numeric-button-hovered-text: $button-hovered-text !default; +$numeric-button-hovered-border: $button-hovered-border !default; +$numeric-button-hovered-gradient: $button-hovered-gradient !default; + +$numeric-button-pressed-text: $button-pressed-text !default; +$numeric-button-pressed-bg: $button-pressed-bg !default; +$numeric-button-pressed-border: $button-pressed-border !default; +$numeric-button-pressed-gradient: $button-pressed-gradient !default; +$numeric-button-pressed-shadow: $button-pressed-shadow !default; diff --git a/packages/classic/scss/_variables.scss b/packages/classic/scss/_variables.scss index d211f38dd69..110406b7b68 100644 --- a/packages/classic/scss/_variables.scss +++ b/packages/classic/scss/_variables.scss @@ -779,43 +779,6 @@ $popup-border: $base-border !default; $popup-shadow: 0 2px 4px 0 rgba(0, 0, 0, .03), 0 4px 5px 0 rgba(0, 0, 0, .04) !default; -// NumericTextBox -$numerictextbox-spinners-focused-shadow: inset $button-focused-shadow !default; - -$numeric-bg: $input-bg !default; -$numeric-text: $input-text !default; -$numeric-border: $input-border !default; - -$numeric-hovered-bg: $input-hovered-bg !default; -$numeric-hovered-text: $input-hovered-text !default; -$numeric-hovered-border: $input-hovered-border !default; - -$numeric-focused-bg: $input-focused-bg !default; -$numeric-focused-text: $input-focused-text !default; -$numeric-focused-border: $input-focused-border !default; -$numeric-focused-shadow: $input-focused-shadow !default; - -$numeric-invalid-bg: null !default; -$numeric-invalid-text: $invalid-text !default; -$numeric-invalid-border: $invalid-border !default; - -$numeric-button-bg: $button-bg !default; -$numeric-button-text: $button-text !default; -$numeric-button-border: $button-border !default; -$numeric-button-gradient: $button-gradient !default; - -$numeric-button-hovered-bg: $button-hovered-bg !default; -$numeric-button-hovered-text: $button-hovered-text !default; -$numeric-button-hovered-border: $button-hovered-border !default; -$numeric-button-hovered-gradient: $button-hovered-gradient !default; - -$numeric-button-pressed-text: $button-pressed-text !default; -$numeric-button-pressed-bg: $button-pressed-bg !default; -$numeric-button-pressed-border: $button-pressed-border !default; -$numeric-button-pressed-gradient: $button-pressed-gradient !default; -$numeric-button-pressed-shadow: $button-pressed-shadow !default; - - $spinner-width: $button-inner-calc-size !default; $spinner-icon-offset: 2px !default; diff --git a/packages/classic/scss/numerictextbox/_index.scss b/packages/classic/scss/numerictextbox/_index.scss index feb7c083637..d4de088b836 100644 --- a/packages/classic/scss/numerictextbox/_index.scss +++ b/packages/classic/scss/numerictextbox/_index.scss @@ -1,3 +1,4 @@ // Component +@import "_variables.scss"; @import "~@progress/kendo-theme-default/scss/numerictextbox/_layout.scss"; @import "~@progress/kendo-theme-default/scss/numerictextbox/_theme.scss"; diff --git a/packages/classic/scss/numerictextbox/_variables.scss b/packages/classic/scss/numerictextbox/_variables.scss new file mode 100644 index 00000000000..ce582cd679e --- /dev/null +++ b/packages/classic/scss/numerictextbox/_variables.scss @@ -0,0 +1,35 @@ +// Numeric textbox +$numerictextbox-spinners-focused-shadow: inset $button-focused-shadow !default; + +$numeric-bg: $input-bg !default; +$numeric-text: $input-text !default; +$numeric-border: $input-border !default; + +$numeric-hovered-bg: $input-hovered-bg !default; +$numeric-hovered-text: $input-hovered-text !default; +$numeric-hovered-border: $input-hovered-border !default; + +$numeric-focused-bg: $input-focused-bg !default; +$numeric-focused-text: $input-focused-text !default; +$numeric-focused-border: $input-focused-border !default; +$numeric-focused-shadow: $input-focused-shadow !default; + +$numeric-invalid-bg: null !default; +$numeric-invalid-text: $invalid-text !default; +$numeric-invalid-border: $invalid-border !default; + +$numeric-button-bg: $button-bg !default; +$numeric-button-text: $button-text !default; +$numeric-button-border: $button-border !default; +$numeric-button-gradient: $button-gradient !default; + +$numeric-button-hovered-bg: $button-hovered-bg !default; +$numeric-button-hovered-text: $button-hovered-text !default; +$numeric-button-hovered-border: $button-hovered-border !default; +$numeric-button-hovered-gradient: $button-hovered-gradient !default; + +$numeric-button-pressed-text: $button-pressed-text !default; +$numeric-button-pressed-bg: $button-pressed-bg !default; +$numeric-button-pressed-border: $button-pressed-border !default; +$numeric-button-pressed-gradient: $button-pressed-gradient !default; +$numeric-button-pressed-shadow: $button-pressed-shadow !default; diff --git a/packages/default/scss/_variables.scss b/packages/default/scss/_variables.scss index 2650a4b760c..1012d0d5511 100644 --- a/packages/default/scss/_variables.scss +++ b/packages/default/scss/_variables.scss @@ -799,43 +799,6 @@ $popup-border: $base-border !default; $popup-shadow: 0 2px 4px 0 rgba(0, 0, 0, .03), 0 4px 5px 0 rgba(0, 0, 0, .04) !default; -// NumericTextBox -$numerictextbox-spinners-focused-shadow: inset $button-focused-shadow !default; - -$numeric-bg: $input-bg !default; -$numeric-text: $input-text !default; -$numeric-border: $input-border !default; - -$numeric-hovered-bg: $input-hovered-bg !default; -$numeric-hovered-text: $input-hovered-text !default; -$numeric-hovered-border: $input-hovered-border !default; - -$numeric-focused-bg: $input-focused-bg !default; -$numeric-focused-text: $input-focused-text !default; -$numeric-focused-border: $input-focused-border !default; -$numeric-focused-shadow: $input-focused-shadow !default; - -$numeric-invalid-bg: null !default; -$numeric-invalid-text: $invalid-text !default; -$numeric-invalid-border: $invalid-border !default; - -$numeric-button-bg: $button-bg !default; -$numeric-button-text: $button-text !default; -$numeric-button-border: $button-border !default; -$numeric-button-gradient: $button-gradient !default; - -$numeric-button-hovered-bg: $button-hovered-bg !default; -$numeric-button-hovered-text: $button-hovered-text !default; -$numeric-button-hovered-border: $button-hovered-border !default; -$numeric-button-hovered-gradient: $button-hovered-gradient !default; - -$numeric-button-pressed-text: $button-pressed-text !default; -$numeric-button-pressed-bg: $button-pressed-bg !default; -$numeric-button-pressed-border: $button-pressed-border !default; -$numeric-button-pressed-gradient: $button-pressed-gradient !default; -$numeric-button-pressed-shadow: $button-pressed-shadow !default; - - $spinner-width: $button-inner-calc-size !default; $spinner-icon-offset: 2px !default; diff --git a/packages/default/scss/numerictextbox/_index.scss b/packages/default/scss/numerictextbox/_index.scss index 04768b46ac3..d988d2adf5e 100644 --- a/packages/default/scss/numerictextbox/_index.scss +++ b/packages/default/scss/numerictextbox/_index.scss @@ -5,9 +5,11 @@ // Dependencies @import "../common/_index.scss"; @import "../input/_index.scss"; +@import "../floating-label/_index.scss"; @import "../icons/_index.scss"; // Component +@import "_variables.scss"; @import "_layout.scss"; @import "_theme.scss"; diff --git a/packages/default/scss/numerictextbox/_variables.scss b/packages/default/scss/numerictextbox/_variables.scss new file mode 100644 index 00000000000..c14f04ead34 --- /dev/null +++ b/packages/default/scss/numerictextbox/_variables.scss @@ -0,0 +1,35 @@ +// Numeric Textbox +$numerictextbox-spinners-focused-shadow: inset $button-focused-shadow !default; + +$numeric-bg: $input-bg !default; +$numeric-text: $input-text !default; +$numeric-border: $input-border !default; + +$numeric-hovered-bg: $input-hovered-bg !default; +$numeric-hovered-text: $input-hovered-text !default; +$numeric-hovered-border: $input-hovered-border !default; + +$numeric-focused-bg: $input-focused-bg !default; +$numeric-focused-text: $input-focused-text !default; +$numeric-focused-border: $input-focused-border !default; +$numeric-focused-shadow: $input-focused-shadow !default; + +$numeric-invalid-bg: null !default; +$numeric-invalid-text: $invalid-text !default; +$numeric-invalid-border: $invalid-border !default; + +$numeric-button-bg: $button-bg !default; +$numeric-button-text: $button-text !default; +$numeric-button-border: $button-border !default; +$numeric-button-gradient: $button-gradient !default; + +$numeric-button-hovered-bg: $button-hovered-bg !default; +$numeric-button-hovered-text: $button-hovered-text !default; +$numeric-button-hovered-border: $button-hovered-border !default; +$numeric-button-hovered-gradient: $button-hovered-gradient !default; + +$numeric-button-pressed-text: $button-pressed-text !default; +$numeric-button-pressed-bg: $button-pressed-bg !default; +$numeric-button-pressed-border: $button-pressed-border !default; +$numeric-button-pressed-gradient: $button-pressed-gradient !default; +$numeric-button-pressed-shadow: $button-pressed-shadow !default; diff --git a/packages/material/scss/_variables.scss b/packages/material/scss/_variables.scss index cf72d885039..9b76c2cc3e1 100644 --- a/packages/material/scss/_variables.scss +++ b/packages/material/scss/_variables.scss @@ -841,43 +841,6 @@ $popup-border: $component-border !default; $popup-shadow: 0 2px 4px -1px rgba( $elevation, .2 ), 0 4px 5px 0 rgba( $elevation, .14 ), 0 1px 10px 0 rgba( $elevation , .12 ) !default; -// NumericTextBox -$numerictextbox-spinners-focused-shadow: null !default; - -$numeric-bg: $input-bg !default; -$numeric-text: $input-text !default; -$numeric-border: $input-border !default; - -$numeric-hovered-bg: $input-hovered-bg !default; -$numeric-hovered-text: $input-hovered-text !default; -$numeric-hovered-border: $input-hovered-border !default; - -$numeric-focused-bg: $input-focused-bg !default; -$numeric-focused-text: $input-focused-text !default; -$numeric-focused-border: $input-focused-border !default; -$numeric-focused-shadow: $input-focused-shadow !default; - -$numeric-invalid-bg: null !default; -$numeric-invalid-text: $error !default; -$numeric-invalid-border: $invalid-border !default; - -$numeric-button-bg: $button-bg !default; -$numeric-button-text: $button-text !default; -$numeric-button-border: $button-border !default; -$numeric-button-gradient: $button-gradient !default; - -$numeric-button-hovered-bg: $button-hovered-bg !default; -$numeric-button-hovered-text: $button-hovered-text !default; -$numeric-button-hovered-border: $button-hovered-border !default; -$numeric-button-hovered-gradient: $button-hovered-gradient !default; - -$numeric-button-pressed-text: $button-pressed-text !default; -$numeric-button-pressed-bg: $button-pressed-bg !default; -$numeric-button-pressed-border: $button-pressed-border !default; -$numeric-button-pressed-gradient: $button-pressed-gradient !default; -$numeric-button-pressed-shadow: $button-pressed-shadow !default; - - $spinner-width: $button-inner-calc-size !default; $spinner-icon-offset: 2px !default; diff --git a/packages/material/scss/numerictextbox/_index.scss b/packages/material/scss/numerictextbox/_index.scss index 04768b46ac3..d988d2adf5e 100644 --- a/packages/material/scss/numerictextbox/_index.scss +++ b/packages/material/scss/numerictextbox/_index.scss @@ -5,9 +5,11 @@ // Dependencies @import "../common/_index.scss"; @import "../input/_index.scss"; +@import "../floating-label/_index.scss"; @import "../icons/_index.scss"; // Component +@import "_variables.scss"; @import "_layout.scss"; @import "_theme.scss"; diff --git a/packages/material/scss/numerictextbox/_variables.scss b/packages/material/scss/numerictextbox/_variables.scss new file mode 100644 index 00000000000..a49177d283d --- /dev/null +++ b/packages/material/scss/numerictextbox/_variables.scss @@ -0,0 +1,35 @@ +// Numeric textbox +$numerictextbox-spinners-focused-shadow: null !default; + +$numeric-bg: $input-bg !default; +$numeric-text: $input-text !default; +$numeric-border: $input-border !default; + +$numeric-hovered-bg: $input-hovered-bg !default; +$numeric-hovered-text: $input-hovered-text !default; +$numeric-hovered-border: $input-hovered-border !default; + +$numeric-focused-bg: $input-focused-bg !default; +$numeric-focused-text: $input-focused-text !default; +$numeric-focused-border: $input-focused-border !default; +$numeric-focused-shadow: $input-focused-shadow !default; + +$numeric-invalid-bg: null !default; +$numeric-invalid-text: $error !default; +$numeric-invalid-border: $invalid-border !default; + +$numeric-button-bg: $button-bg !default; +$numeric-button-text: $button-text !default; +$numeric-button-border: $button-border !default; +$numeric-button-gradient: $button-gradient !default; + +$numeric-button-hovered-bg: $button-hovered-bg !default; +$numeric-button-hovered-text: $button-hovered-text !default; +$numeric-button-hovered-border: $button-hovered-border !default; +$numeric-button-hovered-gradient: $button-hovered-gradient !default; + +$numeric-button-pressed-text: $button-pressed-text !default; +$numeric-button-pressed-bg: $button-pressed-bg !default; +$numeric-button-pressed-border: $button-pressed-border !default; +$numeric-button-pressed-gradient: $button-pressed-gradient !default; +$numeric-button-pressed-shadow: $button-pressed-shadow !default;