fix conflicts

resources/assets/sass/base.scss

@@ -111,3 +111,7 @@ code, .code {
     justify-content: center;
     align-items: center;
 }
+
+.swal-icon--custom {
+    height: 70px !important;
+}

resources/assets/sass/components/vue-multi-select.scss

@@ -1,6 +1,7 @@
 fieldset[disabled] .multiselect {
     pointer-events: none;
 }
+
 .in-valid {
     border: 1px solid $ls-color-red !important;
 }
@@ -18,6 +19,7 @@ fieldset[disabled] .multiselect {
     background: #fff;
     display: block;
 }
+
 .multiselect__spinner:before,
 .multiselect__spinner:after {
     position: absolute;
@@ -33,23 +35,28 @@ fieldset[disabled] .multiselect {
     border-width: 2px;
     box-shadow: 0 0 0 1px transparent;
 }
+
 .multiselect__spinner:before {
     animation: spinning 2.4s cubic-bezier(0.41, 0.26, 0.2, 0.62);
     animation-iteration-count: infinite;
 }
+
 .multiselect__spinner:after {
     animation: spinning 2.4s cubic-bezier(0.51, 0.09, 0.21, 0.8);
     animation-iteration-count: infinite;
 }
+
 .multiselect__loading-enter-active,
 .multiselect__loading-leave-active {
     transition: opacity 0.4s ease-in-out;
     opacity: 1;
 }
+
 .multiselect__loading-enter,
 .multiselect__loading-leave-active {
     opacity: 0;
 }
+
 .multiselect,
 .multiselect__input,
 .multiselect__single {
@@ -57,34 +64,41 @@ fieldset[disabled] .multiselect {
     font-size: 14px;
     touch-action: manipulation;
 }
+
 .multiselect {
     box-sizing: content-box;
     display: block;
     position: relative;
     width: 100%;
-    min-height: 45px;
+    min-height: 40px;
     text-align: left;
     color: #35495e;
 }
+
 .multiselect * {
     box-sizing: border-box;
 }
+
 .multiselect:focus {
     border: 1px solid #817ae3 !important;
 }
+
 .multiselect--disabled {
     pointer-events: none;
     opacity: 0.6;
 }
+
 .multiselect--active {
     z-index: 50;
 }
+
 .multiselect--active:not(.multiselect--above) .multiselect__current,
 .multiselect--active:not(.multiselect--above) .multiselect__input,
 .multiselect--active:not(.multiselect--above) .multiselect__tags {
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
 }
+
 .multiselect--active .multiselect__select {
     transform: rotateZ(180deg);
 }
@@ -94,6 +108,7 @@ fieldset[disabled] .multiselect {
     border-top-left-radius: 0;
     border-top-right-radius: 0;
 }
+
 .multiselect__input,
 .multiselect__single {
     position: relative;
@@ -110,9 +125,11 @@ fieldset[disabled] .multiselect {
     // margin-bottom: 8px;
     vertical-align: top;
 }
+
 .multiselect__input::placeholder {
     color: $ls-color-gray;
 }
+
 .multiselect__tag ~ .multiselect__input,
 .multiselect__tag ~ .multiselect__single {
     width: auto;
@@ -345,68 +362,85 @@ fieldset[disabled] .multiselect {
     cursor: text;
     pointer-events: none;
 }
+
 .multiselect__option--group {
     background: #ededed;
     color: #35495e;
 }
+
 .multiselect__option--group.multiselect__option--highlight {
     background: #35495e;
     color: #fff;
 }
+
 .multiselect__option--group.multiselect__option--highlight:after {
     background: #35495e;
 }
+
 .multiselect__option--disabled.multiselect__option--highlight {
     background: #dedede;
 }
+
 .multiselect__option--group-selected.multiselect__option--highlight {
     background: #ff6a6a;
     color: #fff;
 }
+
 .multiselect__option--group-selected.multiselect__option--highlight:after {
     background: #ff6a6a;
     content: attr(data-deselect);
     color: #fff;
 }
+
 .multiselect-enter-active,
 .multiselect-leave-active {
     transition: all 0.15s ease;
 }
+
 .multiselect-enter,
 .multiselect-leave-active {
     opacity: 0;
 }
+
 .multiselect__strong {
     margin-bottom: 8px;
     line-height: 20px;
     display: inline-block;
     vertical-align: top;
 }
+
 *[dir="rtl"] .multiselect {
     text-align: right;
 }
+
 *[dir="rtl"] .multiselect__select {
     right: auto;
     left: 1px;
 }
+
 *[dir="rtl"] .multiselect__tags {
     padding: 8px 8px 0px 40px;
 }
+
 *[dir="rtl"] .multiselect__content {
     text-align: right;
 }
+
 *[dir="rtl"] .multiselect__option:after {
     right: auto;
     left: 0;
 }
+
 *[dir="rtl"] .multiselect__clear {
     right: auto;
     left: 12px;
 }
+
 *[dir="rtl"] .multiselect__spinner {
     right: auto;
     left: 1px;
 }
+
 @keyframes spinning {
     from {
         transform: rotate(0);
@@ -417,6 +451,7 @@ fieldset[disabled] .multiselect {
 }
 
 .multiselect {
+
     .multiselect__option--highlight {
         background: $ls-color-primary;
         color: $ls-color-black;
@@ -459,6 +494,7 @@ fieldset[disabled] .multiselect {
             }
         }
     }
+
     &.error {
         border: 1px solid $ls-color-red;
         border-radius: 5px;

resources/assets/sass/pages/customers.scss

@@ -27,8 +27,6 @@
 
     .same-address-checkbox-container {
         display: flex;
-        justify-content: flex-end;
-        padding-left: 12px;
         margin-bottom: 1.5rem;
         align-items: center;
         justify-content: flex-end;
@@ -97,7 +95,6 @@
         .same-address-checkbox-container {
             display: flex;
             justify-content: flex-start;
-            padding-left: 15px;
             margin-bottom: 0rem;
         }
 

resources/assets/sass/pages/dashboard.scss

@@ -1,6 +1,23 @@
 // Dashboard
 // -------------------------
 
+.dashboard {
+
+    .dashboard-table
+    .table-component {
+
+        .dashboard-recent-invoice-options {
+
+            .dropdown-container {
+                margin: 10px 5px 0 -75px;
+            }
+
+        }
+
+    }
+
+}
+
 .dashbox {
     background-color: $white;
     box-shadow: $shadow;
@@ -364,5 +381,7 @@
                 justify-content: center;
             }
         }
+
     }
+
 }

resources/assets/sass/pages/estimates/index.scss

@@ -38,7 +38,7 @@
     }
 
     .filter-date {
-        flex: 1;
+        flex: 2;
         display: flex;
         margin-right: 40px;
         align-items: center;
@@ -60,7 +60,7 @@
         margin-top: 28px;
     }
 
-    @media(max-width: $medium-breakpoint ) {
+    @media(max-width: $large-breakpoint ) {
         .filter-container {
             flex-direction: column;
         }

resources/assets/sass/pages/invoices/create.scss

@@ -490,7 +490,7 @@
             font-weight: 300;
             font-size: 12px;
             padding-top: 2px;
-            padding-left: 10px;
+            // padding-left: 10px;
 
             textarea {
 
@@ -504,6 +504,7 @@
                 border: none;
                 resize: none;
                 width: 100%;
+                padding-left: 11px;
                 color: $ls-color-gray--very-dark;
             }
         }

resources/assets/sass/pages/invoices/index.scss

@@ -33,7 +33,7 @@
     }
 
     .filter-date {
-        flex: 1;
+        flex: 2;
         display: flex;
         margin-right: 40px;
         align-items: center;
@@ -55,7 +55,7 @@
         margin-top: 28px;
     }
 
-    @media(max-width: $medium-breakpoint ) {
+    @media(max-width: $large-breakpoint ) {
         .filter-container {
             flex-direction: column;
         }

resources/assets/sass/pages/wizard.scss

@@ -98,6 +98,9 @@
                 border-radius: 50%;
                 height: 21px;
                 width: 21px;
+                display: flex;
+                align-items: center;
+                justify-content: center;
 
                 .icon-check {
                     font-style: normal;