Merge branch 'master' of https://github.com/brkcvn/akaunting into form-elements

resources/assets/js/components/AkauntingColor.vue

@@ -15,7 +15,7 @@
                 ref="dropdownMenu"
                 @click="openPalette"
                 :class="`bg-${color}`"
-                :style="{ backgroundColor: color }"
+                :style="this.color.includes('#') ? `backgroundColor: ${color}` : `backgroundColor: #${color}`"
             ></div>
 
             <transition name="fade">
@@ -115,8 +115,6 @@ export default {
         return {
             isOpen: false,
             color: 'green-500',
-            hexCode: null,
-
             colors: [
                 'gray',
                 'red',
@@ -174,13 +172,11 @@ export default {
         setColor(event) {
             this.isOpen = false;
             this.color = event.target.getAttribute('colorid');
-            this.hexCode = null;
+            this.$refs.dropdownMenu.style = '';
         },
 
         addColor() {
             let code = this.color;
-
-            this.hexCode = code.includes('#') ? code : '#' + code;
         },
 
         closeIfClickedOutside(event) {

resources/assets/sass/app.css

@@ -313,7 +313,7 @@
     border-bottom-right-radius: 4px;
     cursor: pointer !important;
     margin-top: 8px;
-    margin-bottom: 0 !important;
+    margin-bottom: -8px !important;
 }
 
 .el-select__footer:hover {
@@ -334,11 +334,7 @@
 }
 
 .el-select-dropdown__list {
-    padding: 8px 0 0 0;
-}
-
-.el-select-dropdown__item:last-child {
-    margin-bottom: 8px;
+    padding: 8px 0 8px 0;
 }
 
 .el-select .el-select__tags {
@@ -460,6 +456,25 @@ html[dir='rtl'] .el-input__suffix {
   }
  /* element-ui */
 
+ /* apex-chart */
+    .apexcharts-donut-custom span.apexcharts-legend-text {
+        display: -webkit-box !important;
+        -webkit-line-clamp: 1 !important;
+        -webkit-box-orient: vertical !important;
+        overflow: hidden !important;
+        height: 1rem !important;
+    }
+
+    .apexcharts-donut-custom .apexcharts-legend-series {
+        display: flex !important;
+        align-items: center !important;
+    }
+
+    .apexcharts-donut-custom .apexcharts-legend {
+        padding: 0 !important;
+    }
+ /* apex-chart */
+
  /* collapse */
  .active-collapse {
     @apply opacity-100;