fix conflicts

This commit is contained in:
yogesh_gohil
2019-11-14 15:51:48 +05:30
parent 4839e57791
commit 2dda0baa3f
51 changed files with 576 additions and 226 deletions

View File

@ -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;
}
}
}
}