fix: split functions and variables into separate import files

telerik · Oct 14, 2019 · cda7960 · cda7960
1 parent bae49a4
commit cda7960
Show file tree

Hide file tree

Showing 20 changed files with 19 additions and 19 deletions.
diff --git a/packages/bootstrap/.sasslintrc b/packages/bootstrap/.sasslintrc
@@ -5,6 +5,7 @@ files:
     include: 'scss/**/*.scss'
     ignore:
         - 'scss/mixins/**/*.scss'
+        - 'scss/functions/**/*.scss'
 
 rules:
     no-ids: 2

diff --git a/packages/bootstrap/scss/_functions.scss b/packages/bootstrap/scss/_functions.scss
@@ -0,0 +1 @@
+@import "~@progress/kendo-theme-default/scss/_functions.scss";
diff --git a/packages/bootstrap/scss/_variables.scss b/packages/bootstrap/scss/_variables.scss
@@ -1,6 +1,4 @@
-@import "~@progress/kendo-theme-default/scss/mixins/core/_config-maps.scss";
-@import "~@progress/kendo-theme-default/scss/mixins/core/_math.scss";
-@import "~@progress/kendo-theme-default/scss/mixins/_colors.scss";
+@import "_functions.scss";
 @import "_bootstrap-overrides.scss";
 @import "~bootstrap/scss/_functions.scss";
 @import "~bootstrap/scss/_variables.scss";

diff --git a/packages/bootstrap/scss/all.scss b/packages/bootstrap/scss/all.scss
@@ -1,3 +1,4 @@
+@import "_functions.scss";
 @import "_variables.scss";
 @import "_mixins.scss";
 

diff --git a/packages/default/.sasslintrc b/packages/default/.sasslintrc
@@ -5,6 +5,7 @@ files:
     include: 'scss/**/*.scss'
     ignore:
         - 'scss/mixins/**/*.scss'
+        - 'scss/functions/**/*.scss'
 
 rules:
     no-ids: 2

diff --git a/packages/default/scss/_functions.scss b/packages/default/scss/_functions.scss
@@ -0,0 +1,8 @@
+@import "functions/_math.scss";
+@import "functions/_props.scss";
+@import "functions/_config-maps.scss";
+@import "functions/_colors.scss";
+@import "functions/_props.scss";
+@import "functions/_button-size.scss";
+@import "functions/_layout.scss";
+@import "functions/_typography.scss";
diff --git a/packages/default/scss/_mixins.scss b/packages/default/scss/_mixins.scss
@@ -2,27 +2,17 @@
 @import "mixins/core/_import-once.scss";
 @import "mixins/core/_placeholder-selectors.scss";
 @import "mixins/core/_data-uri.scss";
-@import "mixins/core/_math.scss";
 @import "mixins/core/_props.scss";
-@import "mixins/core/_config-maps.scss";
-
-
-// Functions
-@import "mixins/functions/_props.scss";
 
 
 // Utils
 @import "mixins/_border-radius.scss";
 @import "mixins/_box-shadow.scss";
-@import "mixins/_button-size.scss";
-@import "mixins/_colors.scss";
 @import "mixins/_decoration.scss";
 @import "mixins/_disabled.scss";
 @import "mixins/_gradients.scss";
 @import "mixins/_hide-scrollbar.scss";
 @import "mixins/_opacity.scss";
-@import "mixins/_layout.scss";
-@import "mixins/_typography.scss";
 
 
 // Appearance

diff --git a/packages/default/scss/_variables.scss b/packages/default/scss/_variables.scss
@@ -1,6 +1,4 @@
-@import "mixins/core/_config-maps.scss";
-@import "mixins/core/_math.scss";
-@import "mixins/_colors.scss";
+@import "_functions.scss";
 
 
 // Options

diff --git a/packages/default/scss/all.scss b/packages/default/scss/all.scss
@@ -1,3 +1,4 @@
+@import "_functions.scss";
 @import "_variables.scss";
 @import "_mixins.scss";
 

diff --git a/...ges/default/scss/mixins/_button-size.scss → .../default/scss/functions/_button-size.scss b/...ges/default/scss/mixins/_button-size.scss → .../default/scss/functions/_button-size.scss
diff --git a/packages/default/scss/mixins/_colors.scss → packages/default/scss/functions/_colors.scss b/packages/default/scss/mixins/_colors.scss → packages/default/scss/functions/_colors.scss
diff --git a/...efault/scss/mixins/core/_config-maps.scss → .../default/scss/functions/_config-maps.scss b/...efault/scss/mixins/core/_config-maps.scss → .../default/scss/functions/_config-maps.scss
diff --git a/packages/default/scss/mixins/_layout.scss → packages/default/scss/functions/_layout.scss b/packages/default/scss/mixins/_layout.scss → packages/default/scss/functions/_layout.scss
diff --git a/packages/default/scss/mixins/core/_math.scss → packages/default/scss/functions/_math.scss b/packages/default/scss/mixins/core/_math.scss → packages/default/scss/functions/_math.scss
diff --git a/...default/scss/mixins/functions/_props.scss → packages/default/scss/functions/_props.scss b/...default/scss/mixins/functions/_props.scss → packages/default/scss/functions/_props.scss
diff --git a/...ages/default/scss/mixins/_typography.scss → ...s/default/scss/functions/_typography.scss b/...ages/default/scss/mixins/_typography.scss → ...s/default/scss/functions/_typography.scss
diff --git a/packages/material/.sasslintrc b/packages/material/.sasslintrc
@@ -5,6 +5,7 @@ files:
     include: 'scss/**/*.scss'
     ignore:
         - 'scss/mixins/**/*.scss'
+        - 'scss/functions/**/*.scss'
 
 rules:
     no-ids: 2

diff --git a/packages/material/scss/_functions.scss b/packages/material/scss/_functions.scss
@@ -0,0 +1 @@
+@import "~@progress/kendo-theme-default/scss/_functions.scss";
diff --git a/packages/material/scss/_variables.scss b/packages/material/scss/_variables.scss
@@ -1,6 +1,4 @@
-@import "~@progress/kendo-theme-default/scss/mixins/core/_config-maps.scss";
-@import "~@progress/kendo-theme-default/scss/mixins/core/_math.scss";
-@import "~@progress/kendo-theme-default/scss/mixins/_colors.scss";
+@import "_functions.scss";
 @import "common/material/_themeing.scss";
 
 

diff --git a/packages/material/scss/all.scss b/packages/material/scss/all.scss
@@ -1,3 +1,4 @@
+@import "_functions.scss";
 @import "_variables.scss";
 @import "_mixins.scss";