From afc24fe88fa2ed07f45f67ab277f7904762a5e97 Mon Sep 17 00:00:00 2001
From: Dmitry Nehaychik <4dmitr@gmail.com>
Date: Fri, 28 Apr 2017 15:11:22 +0300
Subject: [PATCH] refactor(app): styles refactor

---
 .../base-footer/_base-footer.component.theme.scss   |  4 ++--
 .../base-header/_base-header.component.theme.scss   |  4 ++--
 .../search-input/_search-input.component.theme.scss |  4 ++--
 src/app/@theme/styles/_components.scss              | 10 ++++++----
 .../{_gorgeous.variables.scss => _variables.scss}   |  0
 src/app/@theme/styles/gorgeous/gorgeous.theme.scss  | 13 +++++++------
 .../styles/gorgeous/nga-redefines/redefines.scss    |  7 -------
 .../{nga-redefines => overrides}/_nga-layout.scss   |  4 ++--
 .../{nga-redefines => overrides}/_nga-menu.scss     |  4 ++--
 src/app/@theme/styles/gorgeous/overrides/all.scss   |  7 +++++++
 .../pure/{_pure.variables.scss => _variables.scss}  |  0
 .../@theme/styles/pure/nga-redefines/redefines.scss |  7 -------
 .../{nga-redefines => overrides}/_nga-layout.scss   |  4 ++--
 .../{nga-redefines => overrides}/_nga-menu.scss     |  4 ++--
 src/app/@theme/styles/pure/overrides/all.scss       |  7 +++++++
 src/app/@theme/styles/pure/pure.theme.scss          | 11 ++++++-----
 16 files changed, 47 insertions(+), 43 deletions(-)
 rename src/app/@theme/styles/gorgeous/{_gorgeous.variables.scss => _variables.scss} (100%)
 delete mode 100644 src/app/@theme/styles/gorgeous/nga-redefines/redefines.scss
 rename src/app/@theme/styles/gorgeous/{nga-redefines => overrides}/_nga-layout.scss (96%)
 rename src/app/@theme/styles/gorgeous/{nga-redefines => overrides}/_nga-menu.scss (95%)
 create mode 100644 src/app/@theme/styles/gorgeous/overrides/all.scss
 rename src/app/@theme/styles/pure/{_pure.variables.scss => _variables.scss} (100%)
 delete mode 100644 src/app/@theme/styles/pure/nga-redefines/redefines.scss
 rename src/app/@theme/styles/pure/{nga-redefines => overrides}/_nga-layout.scss (92%)
 rename src/app/@theme/styles/pure/{nga-redefines => overrides}/_nga-menu.scss (94%)
 create mode 100644 src/app/@theme/styles/pure/overrides/all.scss

diff --git a/src/app/@theme/components/base-footer/_base-footer.component.theme.scss b/src/app/@theme/components/base-footer/_base-footer.component.theme.scss
index 340d2977..2bea565c 100644
--- a/src/app/@theme/components/base-footer/_base-footer.component.theme.scss
+++ b/src/app/@theme/components/base-footer/_base-footer.component.theme.scss
@@ -1,4 +1,4 @@
-@mixin base-footer-theme() {
+@mixin base-footer-theme($theme-name) {
   /deep/ base-footer {
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/components/base-header/_base-header.component.theme.scss b/src/app/@theme/components/base-header/_base-header.component.theme.scss
index ba4ea7d9..f83f1159 100644
--- a/src/app/@theme/components/base-header/_base-header.component.theme.scss
+++ b/src/app/@theme/components/base-header/_base-header.component.theme.scss
@@ -1,4 +1,4 @@
-@mixin base-header-theme() {
+@mixin base-header-theme($theme-name) {
   /deep/ base-header {
     .logo > a {
       color: $nga-color-secondary !important;
@@ -13,4 +13,4 @@
       border-color: rgba($nga-color-inverse, 0.2);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/components/search-input/_search-input.component.theme.scss b/src/app/@theme/components/search-input/_search-input.component.theme.scss
index d318f07b..9920a0b2 100644
--- a/src/app/@theme/components/search-input/_search-input.component.theme.scss
+++ b/src/app/@theme/components/search-input/_search-input.component.theme.scss
@@ -1,7 +1,7 @@
-@mixin search-input-theme() {
+@mixin search-input-theme($theme-name) {
   /deep/ search-input {
     input {
       background: transparent;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/styles/_components.scss b/src/app/@theme/styles/_components.scss
index 2b57350b..f3a056ad 100644
--- a/src/app/@theme/styles/_components.scss
+++ b/src/app/@theme/styles/_components.scss
@@ -2,8 +2,10 @@
 @import '../components/search-input/search-input.component.theme';
 @import '../components/base-footer/base-footer.component.theme';
 
-@mixin custom-components-theme() {
-  @include base-header-theme();
-  @include base-footer-theme();
-  @include search-input-theme();
+// TODO: probably move this file into the components folder?
+
+@mixin custom-components-theme($theme-name) {
+  @include base-header-theme($theme-name);
+  @include base-footer-theme($theme-name);
+  @include search-input-theme($theme-name);
 }
diff --git a/src/app/@theme/styles/gorgeous/_gorgeous.variables.scss b/src/app/@theme/styles/gorgeous/_variables.scss
similarity index 100%
rename from src/app/@theme/styles/gorgeous/_gorgeous.variables.scss
rename to src/app/@theme/styles/gorgeous/_variables.scss
diff --git a/src/app/@theme/styles/gorgeous/gorgeous.theme.scss b/src/app/@theme/styles/gorgeous/gorgeous.theme.scss
index 33ecb81c..075e306c 100644
--- a/src/app/@theme/styles/gorgeous/gorgeous.theme.scss
+++ b/src/app/@theme/styles/gorgeous/gorgeous.theme.scss
@@ -1,10 +1,11 @@
 @import '../components';
-@import 'gorgeous.variables';
+@import 'variables';
 
 @import '~@nga/theme/styles/themes/nga.theme.default';
-@import 'nga-redefines/redefines';
+@import 'overrides/all';
 
-@include nga-theme('gorgeous') {
-  @include nga-theme-redefines();
-  @include custom-components-theme();
-}
\ No newline at end of file
+$theme-name: 'gorgeous';
+@include nga-theme($theme-name) {
+  @include nga-theme-overrides($theme-name);
+  @include custom-components-theme($theme-name);
+}
diff --git a/src/app/@theme/styles/gorgeous/nga-redefines/redefines.scss b/src/app/@theme/styles/gorgeous/nga-redefines/redefines.scss
deleted file mode 100644
index 750f48ec..00000000
--- a/src/app/@theme/styles/gorgeous/nga-redefines/redefines.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import 'nga-layout';
-@import 'nga-menu';
-
-@mixin nga-theme-redefines {
-  @include nga-layout-redefines();
-  @include nga-menu-redefines();
-}
\ No newline at end of file
diff --git a/src/app/@theme/styles/gorgeous/nga-redefines/_nga-layout.scss b/src/app/@theme/styles/gorgeous/overrides/_nga-layout.scss
similarity index 96%
rename from src/app/@theme/styles/gorgeous/nga-redefines/_nga-layout.scss
rename to src/app/@theme/styles/gorgeous/overrides/_nga-layout.scss
index 799e6c3a..314666a4 100644
--- a/src/app/@theme/styles/gorgeous/nga-redefines/_nga-layout.scss
+++ b/src/app/@theme/styles/gorgeous/overrides/_nga-layout.scss
@@ -1,4 +1,4 @@
-@mixin nga-layout-redefines {
+@mixin nga-layout-override($theme-name) {
   $layout-shadow: 0 8px 20px 0 rgba(37, 26, 75, 0.68);
 
   /deep/ .layout {
@@ -69,4 +69,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/styles/gorgeous/nga-redefines/_nga-menu.scss b/src/app/@theme/styles/gorgeous/overrides/_nga-menu.scss
similarity index 95%
rename from src/app/@theme/styles/gorgeous/nga-redefines/_nga-menu.scss
rename to src/app/@theme/styles/gorgeous/overrides/_nga-menu.scss
index 34167da8..cb49b8f7 100644
--- a/src/app/@theme/styles/gorgeous/nga-redefines/_nga-menu.scss
+++ b/src/app/@theme/styles/gorgeous/overrides/_nga-menu.scss
@@ -1,4 +1,4 @@
-@mixin nga-menu-redefines {
+@mixin nga-menu-override($theme-name) {
   /deep/ nga-menu {
     ul li {
       &:first-child {
@@ -43,4 +43,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/styles/gorgeous/overrides/all.scss b/src/app/@theme/styles/gorgeous/overrides/all.scss
new file mode 100644
index 00000000..47637813
--- /dev/null
+++ b/src/app/@theme/styles/gorgeous/overrides/all.scss
@@ -0,0 +1,7 @@
+@import 'nga-layout';
+@import 'nga-menu';
+
+@mixin nga-theme-overrides($theme-name) {
+  @include nga-layout-override($theme-name);
+  @include nga-menu-override($theme-name);
+}
diff --git a/src/app/@theme/styles/pure/_pure.variables.scss b/src/app/@theme/styles/pure/_variables.scss
similarity index 100%
rename from src/app/@theme/styles/pure/_pure.variables.scss
rename to src/app/@theme/styles/pure/_variables.scss
diff --git a/src/app/@theme/styles/pure/nga-redefines/redefines.scss b/src/app/@theme/styles/pure/nga-redefines/redefines.scss
deleted file mode 100644
index 750f48ec..00000000
--- a/src/app/@theme/styles/pure/nga-redefines/redefines.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import 'nga-layout';
-@import 'nga-menu';
-
-@mixin nga-theme-redefines {
-  @include nga-layout-redefines();
-  @include nga-menu-redefines();
-}
\ No newline at end of file
diff --git a/src/app/@theme/styles/pure/nga-redefines/_nga-layout.scss b/src/app/@theme/styles/pure/overrides/_nga-layout.scss
similarity index 92%
rename from src/app/@theme/styles/pure/nga-redefines/_nga-layout.scss
rename to src/app/@theme/styles/pure/overrides/_nga-layout.scss
index ca562061..0d63db97 100644
--- a/src/app/@theme/styles/pure/nga-redefines/_nga-layout.scss
+++ b/src/app/@theme/styles/pure/overrides/_nga-layout.scss
@@ -1,4 +1,4 @@
-@mixin nga-layout-redefines {
+@mixin nga-layout-override($theme-name) {
   $layout-border-shadow: 0 4px 12px 0 rgba(33, 57, 161, 0.08);
 
   /deep/ .layout {
@@ -24,4 +24,4 @@
       padding: 1.25rem;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/styles/pure/nga-redefines/_nga-menu.scss b/src/app/@theme/styles/pure/overrides/_nga-menu.scss
similarity index 94%
rename from src/app/@theme/styles/pure/nga-redefines/_nga-menu.scss
rename to src/app/@theme/styles/pure/overrides/_nga-menu.scss
index d62ac88f..f653cd03 100644
--- a/src/app/@theme/styles/pure/nga-redefines/_nga-menu.scss
+++ b/src/app/@theme/styles/pure/overrides/_nga-menu.scss
@@ -1,4 +1,4 @@
-@mixin nga-menu-redefines {
+@mixin nga-menu-override($theme-name) {
   /deep/ nga-menu {
     ul li {
       transition: all 0.2s ease;
@@ -36,4 +36,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/@theme/styles/pure/overrides/all.scss b/src/app/@theme/styles/pure/overrides/all.scss
new file mode 100644
index 00000000..47637813
--- /dev/null
+++ b/src/app/@theme/styles/pure/overrides/all.scss
@@ -0,0 +1,7 @@
+@import 'nga-layout';
+@import 'nga-menu';
+
+@mixin nga-theme-overrides($theme-name) {
+  @include nga-layout-override($theme-name);
+  @include nga-menu-override($theme-name);
+}
diff --git a/src/app/@theme/styles/pure/pure.theme.scss b/src/app/@theme/styles/pure/pure.theme.scss
index 134db950..a8408ccf 100644
--- a/src/app/@theme/styles/pure/pure.theme.scss
+++ b/src/app/@theme/styles/pure/pure.theme.scss
@@ -1,10 +1,11 @@
-@import 'pure.variables';
+@import 'variables';
 @import '../components';
-@import 'nga-redefines/redefines';
+@import 'overrides/all';
 
 @import '~@nga/theme/styles/themes/nga.theme.default';
 
-@include nga-theme('pure') {
-  @include nga-theme-redefines();
-  @include custom-components-theme();
+$theme-name: 'pure';
+@include nga-theme($theme-name) {
+  @include nga-theme-overrides($theme-name);
+  @include custom-components-theme($theme-name);
 }