Skip to content

Commit

Permalink
Merge branch 'release/3.5.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
beatrizsmerino committed Oct 22, 2024
2 parents dc605a5 + 12dd7a5 commit 491b8ef
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 49 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// ABSTRACTS - FUNCTIONS
// CONTAINS
// =================================================
@use "sass:list";

@function contains($list, $item) {
@return list.index($list, $item) != null;
}
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
// SETTINGS
// ABSTRACTS - VARIABLES
// COLORS
// ------------------
// =================================================
@use "sass:color";

// GRAY SCALE
// =================================================
// ----------------------------------------------------------------------
$color-black: #000000;
$color-gray: #3f3f3f;
$color-silver: #d5d5d5;
$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%);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// SETTINGS
// ABSTRACTS - VARIABLES
// FONTS
// ------------------
// =================================================

// BRAND
// =================================================
// ----------------------------------------------------------------------
$font-brand-1: "Dauphin", "Bradley Hand", sans-serif;
$font-brand-2: "Oxygen", helvetica, cursive;
21 changes: 0 additions & 21 deletions src/assets/scss/settings/settings-breakpoints.scss

This file was deleted.

20 changes: 10 additions & 10 deletions src/assets/scss/styles.scss
Original file line number Diff line number Diff line change
@@ -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";

0 comments on commit 491b8ef

Please sign in to comment.