diff --git a/src/assets/scss/abstracts/functions/_abstracts-functions-contains.scss b/src/assets/scss/abstracts/functions/_abstracts-functions-contains.scss new file mode 100644 index 00000000..6d18f3ca --- /dev/null +++ b/src/assets/scss/abstracts/functions/_abstracts-functions-contains.scss @@ -0,0 +1,8 @@ +// ABSTRACTS - FUNCTIONS +// CONTAINS +// ================================================= +@use "sass:list"; + +@function contains($list, $item) { + @return list.index($list, $item) != null; +} diff --git a/src/assets/scss/tools/tools-media.scss b/src/assets/scss/abstracts/mixins/_abstracts-mixins-media.scss similarity index 86% rename from src/assets/scss/tools/tools-media.scss rename to src/assets/scss/abstracts/mixins/_abstracts-mixins-media.scss index 33f51dbe..a906121e 100644 --- a/src/assets/scss/tools/tools-media.scss +++ b/src/assets/scss/abstracts/mixins/_abstracts-mixins-media.scss @@ -1,16 +1,11 @@ -// TOOLS -// MIXIN -// media queries -// ------------------ -@use "sass:list"; +// ABSTRACTS - MIXINS +// MEDIA +// ================================================= @use "sass:map"; @use "sass:math"; @use "sass:meta"; -@use "../settings/settings-breakpoints" as *; - -@function contains($list, $item) { - @return list.index($list, $item) != null; -} +@use "../functions/abstracts-functions-contains" as *; +@use "../variables/abstracts-variables-breakpoints" as *; @mixin media($breakpoint, $rule: "max", $dimension: "width") { $rules: "max", "min"; diff --git a/src/assets/scss/abstracts/variables/_abstracts-variables-breakpoints.scss b/src/assets/scss/abstracts/variables/_abstracts-variables-breakpoints.scss new file mode 100644 index 00000000..3689b0c8 --- /dev/null +++ b/src/assets/scss/abstracts/variables/_abstracts-variables-breakpoints.scss @@ -0,0 +1,20 @@ +// ABSTRACTS - VARIABLES +// BREAKPOINTS +// ================================================= + +$breakpoints: ( + xs: 480px, + // mobile portrait + sm: 576px, + // mobile landscape + md: 768px, + // tablet portrait + lg: 992px, + // tablet portrait + xl: 1024px, + // tablet landscape + xxl: 1280px, + // laptop + xxxl: 1600px, + // desktop +) !default; diff --git a/src/assets/scss/settings/settings-colors.scss b/src/assets/scss/abstracts/variables/_abstracts-variables-colors.scss similarity index 65% rename from src/assets/scss/settings/settings-colors.scss rename to src/assets/scss/abstracts/variables/_abstracts-variables-colors.scss index 5049396f..dcf6c1b1 100644 --- a/src/assets/scss/settings/settings-colors.scss +++ b/src/assets/scss/abstracts/variables/_abstracts-variables-colors.scss @@ -1,10 +1,10 @@ -// SETTINGS +// ABSTRACTS - VARIABLES // COLORS -// ------------------ +// ================================================= @use "sass:color"; // GRAY SCALE -// ================================================= +// ---------------------------------------------------------------------- $color-black: #000000; $color-gray: #3f3f3f; $color-silver: #d5d5d5; @@ -12,12 +12,12 @@ $color-light: #fafafa; $color-white: #ffffff; // STATUS -// ================================================= +// ---------------------------------------------------------------------- $color-error: #ff6347; $color-success: #008080; // BRAND -// ================================================= +// ---------------------------------------------------------------------- $color-brand-1: #42b883; $color-brand-2: #35495e; $color-brand-2--dark: color.mix($color-black, $color-brand-2, 20%); diff --git a/src/assets/scss/settings/settings-fonts.scss b/src/assets/scss/abstracts/variables/_abstracts-variables-fonts.scss similarity index 63% rename from src/assets/scss/settings/settings-fonts.scss rename to src/assets/scss/abstracts/variables/_abstracts-variables-fonts.scss index ea63dba5..6484c225 100644 --- a/src/assets/scss/settings/settings-fonts.scss +++ b/src/assets/scss/abstracts/variables/_abstracts-variables-fonts.scss @@ -1,8 +1,8 @@ -// SETTINGS +// ABSTRACTS - VARIABLES // FONTS -// ------------------ +// ================================================= // BRAND -// ================================================= +// ---------------------------------------------------------------------- $font-brand-1: "Dauphin", "Bradley Hand", sans-serif; $font-brand-2: "Oxygen", helvetica, cursive; diff --git a/src/assets/scss/settings/settings-breakpoints.scss b/src/assets/scss/settings/settings-breakpoints.scss deleted file mode 100644 index 2a2f7749..00000000 --- a/src/assets/scss/settings/settings-breakpoints.scss +++ /dev/null @@ -1,21 +0,0 @@ -// SETTINGS -// BREAKPOINTS -// ------------------ - -// xs - mobile -// sm - mobile -// md - iPad portrait -// lg - iPad portrait -// xl - iPad landscape -// xxl - laptop -// xxl - big display - -$breakpoints: ( - xs: 480px, - sm: 576px, - md: 768px, - lg: 992px, - xl: 1024px, - xxl: 1280px, - xxxl: 1600px, -) !default; diff --git a/src/assets/scss/styles.scss b/src/assets/scss/styles.scss index fa222cf2..e3e696da 100644 --- a/src/assets/scss/styles.scss +++ b/src/assets/scss/styles.scss @@ -1,12 +1,12 @@ // PARTIALS SCSS -// ------------------ +// =============================================================================== -// SETTINGS -// ================================================= -@forward "settings/settings-breakpoints"; -@forward "settings/settings-colors"; -@forward "settings/settings-fonts"; - -// TOOLS -// ================================================= -@forward "tools/tools-media"; +// ABSTRACTS +// ---------------------------------------------------------------------- +@forward "abstracts/functions/abstracts-functions-contains"; +// ------------------- +@forward "abstracts/mixins/abstracts-mixins-media"; +// ------------------- +@forward "abstracts/variables/abstracts-variables-breakpoints"; +@forward "abstracts/variables/abstracts-variables-colors"; +@forward "abstracts/variables/abstracts-variables-fonts";