From b4b041260b9504c6d7a212aa886e055253684d56 Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Fri, 14 Jul 2017 10:20:27 +0100
Subject: [PATCH] core sass enhancements (#2083)

- simplify file names
- simpify imports
- placeholder for mixins
---
 .../styles/{_variables-color.scss => _colors.scss}         | 0
 .../{_variables-mdl-overrides.scss => _mdl-overrides.scss} | 2 +-
 ng2-components/ng2-alfresco-core/styles/_mixins.scss       | 0
 ng2-components/ng2-alfresco-core/styles/_theming.scss      | 7 ++++---
 .../ng2-alfresco-core/styles/_variables-general.scss       | 1 -
 ng2-components/ng2-alfresco-core/styles/_variables.scss    | 3 +++
 6 files changed, 8 insertions(+), 5 deletions(-)
 rename ng2-components/ng2-alfresco-core/styles/{_variables-color.scss => _colors.scss} (100%)
 rename ng2-components/ng2-alfresco-core/styles/{_variables-mdl-overrides.scss => _mdl-overrides.scss} (92%)
 create mode 100644 ng2-components/ng2-alfresco-core/styles/_mixins.scss
 delete mode 100644 ng2-components/ng2-alfresco-core/styles/_variables-general.scss
 create mode 100644 ng2-components/ng2-alfresco-core/styles/_variables.scss

diff --git a/ng2-components/ng2-alfresco-core/styles/_variables-color.scss b/ng2-components/ng2-alfresco-core/styles/_colors.scss
similarity index 100%
rename from ng2-components/ng2-alfresco-core/styles/_variables-color.scss
rename to ng2-components/ng2-alfresco-core/styles/_colors.scss
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables-mdl-overrides.scss b/ng2-components/ng2-alfresco-core/styles/_mdl-overrides.scss
similarity index 92%
rename from ng2-components/ng2-alfresco-core/styles/_variables-mdl-overrides.scss
rename to ng2-components/ng2-alfresco-core/styles/_mdl-overrides.scss
index 3070639ed1..5de631c0fe 100644
--- a/ng2-components/ng2-alfresco-core/styles/_variables-mdl-overrides.scss
+++ b/ng2-components/ng2-alfresco-core/styles/_mdl-overrides.scss
@@ -1,4 +1,4 @@
-@import './_variables-color.scss';
+@import 'colors';
 
 $button-fab-color-alt: $alfresco-primary-accent--default;
 
diff --git a/ng2-components/ng2-alfresco-core/styles/_mixins.scss b/ng2-components/ng2-alfresco-core/styles/_mixins.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ng2-components/ng2-alfresco-core/styles/_theming.scss b/ng2-components/ng2-alfresco-core/styles/_theming.scss
index 4f758d6cc0..106d48780d 100644
--- a/ng2-components/ng2-alfresco-core/styles/_theming.scss
+++ b/ng2-components/ng2-alfresco-core/styles/_theming.scss
@@ -1,3 +1,4 @@
-@import './_variables-general';
-@import './_variables-color';
-@import './_variables-mdl-overrides';
+@import 'mixins';
+@import 'variables';
+@import 'colors';
+@import 'mdl-overrides';
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables-general.scss b/ng2-components/ng2-alfresco-core/styles/_variables-general.scss
deleted file mode 100644
index db17d1e0dd..0000000000
--- a/ng2-components/ng2-alfresco-core/styles/_variables-general.scss
+++ /dev/null
@@ -1 +0,0 @@
-$ADF: adf;
\ No newline at end of file
diff --git a/ng2-components/ng2-alfresco-core/styles/_variables.scss b/ng2-components/ng2-alfresco-core/styles/_variables.scss
new file mode 100644
index 0000000000..3093a068c6
--- /dev/null
+++ b/ng2-components/ng2-alfresco-core/styles/_variables.scss
@@ -0,0 +1,3 @@
+@import 'colors';
+
+$ADF: adf;