fix: conflict

Author: Fabian Morón Zirfas

.vscode/settings.json

@@ -0,0 +1,16 @@
+{
+  "workbench.colorCustomizations": {
+    "activityBar.background": "#a9d882",
+    "activityBar.foreground": "#15202b",
+    "activityBar.inactiveForeground": "#15202b99",
+    "activityBarBadge.background": "#558aca",
+    "activityBarBadge.foreground": "#15202b",
+    "titleBar.activeBackground": "#8ecc5b",
+    "titleBar.inactiveBackground": "#8ecc5b99",
+    "titleBar.activeForeground": "#15202b",
+    "titleBar.inactiveForeground": "#15202b99",
+    "statusBar.background": "#8ecc5b",
+    "statusBarItem.hoverBackground": "#74ba3a",
+    "statusBar.foreground": "#15202b"
+  }
+}

_source/_sass/_mixins.sass

@@ -0,0 +1,107 @@
+@mixin clearfix {
+  &::after {
+    content: "";
+    display: table;
+    clear: both;
+  }
+}
+
+@mixin divider($type, $color: $color-divider) {
+  @if $type == "headline" {
+    display: block;
+    position: relative;
+    margin: 0 auto 50px auto;
+    text-align: center;
+    padding: 0px 20px;
+
+    &::before {
+      border-bottom: 1px solid $color;
+      content: "";
+      width: 47%;
+      margin-left: -50%;
+      top: 50%;
+      height: 1px;
+      position: absolute;
+    }
+
+    &::after {
+      border-bottom: 1px solid $color;
+      content: "";
+      width: 47%;
+      margin-left: 3%;
+      top: 50%;
+      height: 1px;
+      position: absolute;
+    }
+  }
+  @else if $type == "single" {
+    height: 1px;
+    width: 100%;
+    clear: both;
+    background-color: $color-divider;
+  }
+}
+
+@mixin placeholder($color) {
+  &::-webkit-input-placeholder {
+    color: $color;
+    opacity: 1;
+  }
+
+  &:-moz-placeholder {
+    color: $color;
+    opacity: 1;
+  }
+
+  &::-moz-placeholder {
+    color: $color;
+    opacity: 1;
+  }
+
+  &:-ms-input-placeholder {
+    color: $color;
+    opacity: 1;
+  }
+}
+
+@mixin media($width) {
+  @media screen and (max-width: $width) {
+    @content;
+  }
+}
+
+@mixin animation($animate...) {
+  $max: length($animate);
+  $animations: "";
+
+  @for $i from 1 through $max {
+    $animations: #{$animations + nth($animate, $i)};
+
+    @if $i < $max {
+      $animations: #{$animations + ", "};
+    }
+  }
+
+  -webkit-animation: $animations;
+  -moz-animation: $animations;
+  -o-animation: $animations;
+  animation: $animations;
+}
+
+@mixin keyframes($animationName) {
+  @-webkit-keyframes #{$animationName} {
+    @content;
+  }
+
+  @-moz-keyframes #{$animationName} {
+    @content;
+  }
+
+  @-o-keyframes #{$animationName} {
+    @content;
+  }
+
+  @keyframes #{$animationName} {
+    @content;
+  }
+}