From 26078936b93e4cd9287c4c21a54d54476762b4a2 Mon Sep 17 00:00:00 2001
From: Avris <andre@avris.it>
Date: Wed, 11 Nov 2020 22:53:55 +0100
Subject: [PATCH] #97 [bug] fix duplicated inlined assets

---
 assets/style.scss           | 17 +----------------
 assets/variables.scss       | 18 ++++++++++++++++++
 components/Account.vue      |  2 +-
 components/Confirm.vue      |  2 +-
 components/Dictionary.vue   |  2 +-
 components/Header.vue       |  2 +-
 components/ScrollButton.vue |  2 +-
 components/Separator.vue    |  2 +-
 components/SquareButton.vue |  2 +-
 components/Table.vue        |  2 +-
 10 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 assets/variables.scss

diff --git a/assets/style.scss b/assets/style.scss
index 66a43706..4bbfafcf 100644
--- a/assets/style.scss
+++ b/assets/style.scss
@@ -1,20 +1,7 @@
 @import "fonts";
-$font-family-sans-serif: Nunito, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
-$headings-font-family: Quicksand, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
 
-$primary: #C71585;
-$alert-border-level: -3;
+@import "variables";
 
-$container-max-widths: (
-        sm: 540px,
-        md: 768px,
-        lg: 769px,
-        xl: 770px
-) !default;
-
-@import "~bootstrap/scss/functions";
-@import "~bootstrap/scss/variables";
-@import "~bootstrap/scss/mixins";
 @import "~bootstrap/scss/root";
 @import "~bootstrap/scss/reboot";
 @import "~bootstrap/scss/type";
@@ -61,8 +48,6 @@ html {
 }
 
 body {
-    //padding-top: 2rem;
-    //padding-bottom: 2rem;
     margin: 2rem auto;
     max-width: min(90vw, 768px);
 }
diff --git a/assets/variables.scss b/assets/variables.scss
new file mode 100644
index 00000000..d30c6a22
--- /dev/null
+++ b/assets/variables.scss
@@ -0,0 +1,18 @@
+$font-family-sans-serif: Nunito, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
+$headings-font-family: Quicksand, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji" !default;
+
+$primary: #C71585;
+$alert-border-level: -3;
+
+$container-max-widths: (
+        sm: 540px,
+        md: 768px,
+        lg: 769px,
+        xl: 770px
+) !default;
+
+@import "~bootstrap/scss/functions";
+@import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/mixins";
+
+@import '~@fortawesome/fontawesome-pro/scss/variables';
diff --git a/components/Account.vue b/components/Account.vue
index bac7cb8f..6a8b0156 100644
--- a/components/Account.vue
+++ b/components/Account.vue
@@ -201,7 +201,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "assets/style";
+    @import "assets/variables";
 
     .profile-current {
         border-left: 3px solid $primary;
diff --git a/components/Confirm.vue b/components/Confirm.vue
index 870b8cd5..a8773bea 100644
--- a/components/Confirm.vue
+++ b/components/Confirm.vue
@@ -86,7 +86,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "assets/style";
+    @import "assets/variables";
 
     .modal {
         background-color: rgba($black, 0.5);
diff --git a/components/Dictionary.vue b/components/Dictionary.vue
index 7773f928..e008ca15 100644
--- a/components/Dictionary.vue
+++ b/components/Dictionary.vue
@@ -274,7 +274,7 @@
 </script>
 
 <style lang="scss">
-    @import "assets/style";
+    @import "assets/variables";
 
     .list-singular {
         padding-left: 0;
diff --git a/components/Header.vue b/components/Header.vue
index 8796aed8..b9993dbb 100644
--- a/components/Header.vue
+++ b/components/Header.vue
@@ -160,7 +160,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "assets/style";
+    @import "assets/variables";
 
     @include media-breakpoint-down('sm', $grid-breakpoints) {
         .nav-custom {
diff --git a/components/ScrollButton.vue b/components/ScrollButton.vue
index 2a134ad7..f588f350 100644
--- a/components/ScrollButton.vue
+++ b/components/ScrollButton.vue
@@ -36,7 +36,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "assets/style";
+    @import "assets/variables";
 
     .scroll-btn {
         position: fixed;
diff --git a/components/Separator.vue b/components/Separator.vue
index dee543f1..afab5b8b 100644
--- a/components/Separator.vue
+++ b/components/Separator.vue
@@ -15,7 +15,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "assets/style";
+    @import "assets/variables";
 
     // https://front-back.com/pure-css-3-fancy-separator/
 
diff --git a/components/SquareButton.vue b/components/SquareButton.vue
index 0c941396..4bc39798 100644
--- a/components/SquareButton.vue
+++ b/components/SquareButton.vue
@@ -14,7 +14,7 @@
 </script>
 
 <style lang="scss" scoped>
-    @import "assets/style";
+    @import "assets/variables";
     $size: 2.2rem;
 
     .btn-square {
diff --git a/components/Table.vue b/components/Table.vue
index 811262fa..9b011e57 100644
--- a/components/Table.vue
+++ b/components/Table.vue
@@ -104,7 +104,7 @@
 </script>
 
 <style lang="scss">
-    @import "assets/style";
+    @import "assets/variables";
 
     .marked {
         border-left: 3px solid $primary;