- fix: store children accounts with Redux store.

- fix: store expense payment date with transactions.
- fix: Total assets, liabilities and equity on balance sheet.
- tweaks: dashboard content and sidebar style.
- fix: reset form with contact list on journal entry form.
- feat: Add hints to filter accounts in financial statements.
This commit is contained in:
Ahmed Bouhuolia
2020-07-12 12:31:12 +02:00
parent 4bd8f1628d
commit 9d9c7c1568
60 changed files with 1685 additions and 929 deletions

View File

@@ -22,10 +22,10 @@
overflow-x: hidden;
.th{
padding: 0.75rem 0.5rem;
padding: 0.6rem 0.5rem;
background: #fafafa;
font-size: 14px;
color: rgb(59, 71, 91);
color: #445165;
font-weight: 500;
border-bottom: 1px solid rgb(224, 224, 224);
}
@@ -156,13 +156,17 @@
border: 0;
box-shadow: none;
padding: 5px 15px;
border-radius: 5px;
border-radius: 8px;
&:hover,
&:focus{
background-color: #CFDCEE;
}
svg{
color: #425361
}
.bp3-icon-more-h-16{
margin-top: 2px;
}
@@ -289,7 +293,7 @@
.tbody{
.tr .td{
border-bottom: 1px dotted #BBB;
border-bottom: 1px dotted #CCC;
}
}
}

View File

@@ -138,7 +138,11 @@ $form-check-input-indeterminate-bg-image: url("data:image/svg+xml,<svg xmlns='ht
.bp3-button:not(.bp3-minimal){
border-color: #db3737;
}
}
}
}
.select-list--tooltip-items .bp3-popover-target {
display: block;
}
@@ -332,4 +336,9 @@ $form-check-input-indeterminate-bg-image: url("data:image/svg+xml,<svg xmlns='ht
-moz-outline-radius: $control-indicator-size;
}
}
}
.bp3-menu-item::before, .bp3-menu-item > .bp3-icon{
color: #4b5d6b;
}

View File

@@ -62,7 +62,7 @@
.dialog--account-form{
&:not(.dialog--loading) .bp3-dialog-body{
margin-bottom: 25px;
margin-bottom: 30px;
}
.bp3-dialog-body{
@@ -91,9 +91,6 @@
}
}
.form-group--parent-account{
margin-bottom: 35px;
}
.form-group--account-code{
margin-bottom: 16px;
}

View File

@@ -15,7 +15,7 @@
&__topbar{
width: 100%;
min-height: 66px;
min-height: 62px;
display: flex;
justify-content: space-between;
border-bottom: 1px solid #F2EFEF;
@@ -137,17 +137,17 @@
margin-right: 0;
}
.#{$ns}-button{
color: #4d4d4d;
color: #32304a;
padding: 8px 12px;
&:hover{
background: rgba(167, 182, 194, 0.12);
color: #4d4d4d;
color: #32304a;
}
&.bp3-minimal:active,
&.bp3-minimal.bp3-active{
background: rgba(167, 182, 194, 0.12);
color: #4d4d4d;
color: #32304a;
}
&.has-active-filters{
@@ -158,7 +158,7 @@
}
}
.#{$ns}-icon{
color: #4d4d4d;
color: #2A293D;
margin-right: 7px;
}
&.#{$ns}-minimal.#{$ns}-intent-danger{
@@ -207,12 +207,12 @@
&__title{
align-items: center;;
display: flex;
margin-left: 4px;
margin-left: 2px;
h1{
font-size: 26px;
font-weight: 300;
color: #050035;
color: #2c2c39;
margin: 0;
}
h3{
@@ -278,7 +278,7 @@
.tbody{
.th.selection,
.td.selection{
padding-left: 14px;
padding-left: 16px;
}
}
}
@@ -350,7 +350,7 @@
.#{$ns}-tab-indicator-wrapper{
.#{$ns}-tab-indicator{
height: 2px;
height: 3px;
}
}

View File

@@ -35,15 +35,14 @@
}
&__body{
padding-left: 20px;
padding-right: 20px;
padding-left: 15px;
padding-right: 15px;
display: flex;
justify-content: center;
align-items: center;
}
&__header.is-hidden + .financial-statement__body{
.financial-sheet{
margin-top: 40px;
}
@@ -55,7 +54,7 @@
border-radius: 10px;
min-width: 640px;
width: auto;
padding: 30px 20px;
padding: 30px 18px;
max-width: 100%;
margin: 15px auto 35px;
min-height: 400px;
@@ -65,7 +64,7 @@
&__title{
margin: 0;
font-weight: 400;
font-size: 22px;
font-size: 20px;
color: #464646;
text-align: center;
}
@@ -93,6 +92,7 @@
background: #fff;
}
}
.tr.no-results{
.td{
flex-direction: column;
@@ -117,7 +117,8 @@
font-size: 12px;
}
.dashboard__loading-indicator{
margin: 60px auto 0;
margin: auto;
padding: 0;
}
&--expended{
@@ -141,7 +142,9 @@
&--opening_balance,
&--closing_balance{
background-color: #fbfbfb;
.td{
background-color: #fbfbfb;
}
}
&--closing_balance .td{
@@ -158,28 +161,22 @@
&--general-ledger,
&--journal{
width: auto;
margin-left: 10px;
margin-right: 10px;
margin-top: 10px;
border-color: #EEEDED;
}
&--journal{
.financial-sheet__table{
.tbody{
.tr:not(.no-results) .td{
padding: 0.4rem;
color: #444;
border-bottom-color: #F0F0F0;
color: #000;
border-bottom-color: #DDD;
min-height: 32px;
border-left: 1px solid #F0F0F0;
border-left: 1px dotted #DDD;
&:first-of-type{
border-left: 0;
}
&.account_code{
color: #666;
}
}
}
}
@@ -189,9 +186,6 @@
.financial-sheet__table{
.tbody{
.account_code.td{
color: #666;
}
.total.td {
border-bottom-color: #000;
}
@@ -212,10 +206,25 @@
&--balance-sheet{
.financial-sheet__table{
.tbody{
.total.td{
border-bottom-color: #000;
}
.tr.row_type--total_row{
.total.td,
.account_name.td{
font-weight: 600;
color: #333;
}
}
.tr.is-expanded{
.td.total,
.td.total-period{
> span{
display: none;
}
}
}
}
}
}
@@ -236,6 +245,29 @@
}
}
}
&--minimal{
border: 0;
padding: 0;
margin-top: 20px;
.financial-sheet{
&__title{
font-size: 18px;
color: #333;
}
&__title + .financial-sheet__date{
margin-top: 8px;
}
&__table{
margin-top: 20px;
}
}
}
&.is-full-width{
width: 100%;
}
}
@@ -272,6 +304,5 @@
line-height: 1.55;
margin-top: 12px;
}
}
}

View File

@@ -2,10 +2,11 @@ $sidebar-background: #01194e;
$sidebar-text-color: #fff;
$sidebar-width: 100%;
$sidebar-menu-item-color: rgba(255, 255, 255, 0.9);
$sidebar-menu-item-color-active: rgb(255, 255, 255);
$sidebar-popover-submenu-bg: rgb(1, 20, 62);
$sidebar-menu-label-color: rgba(255, 255, 255, 0.5);
$sidebar-submenu-item-color: rgba(255, 255, 255, 0.55);
$sidebar-submenu-item-hover-color: rgba(255, 255, 255, 0.8);
$sidebar-submenu-item-color: rgba(255, 255, 255, 0.6);
$sidebar-submenu-item-hover-color: rgba(255, 255, 255, 0.85);
$sidebar-logo-opacity: 0.55;
$sidebar-submenu-item-bg-color: #01287d;
@@ -71,7 +72,7 @@ $sidebar-submenu-item-bg-color: #01287d;
&:hover,
&.bp3-active {
background: $sidebar-submenu-item-bg-color;
color: $sidebar-menu-item-color;
color: $sidebar-menu-item-color-active;
}
&:focus,
&:active {
@@ -105,9 +106,8 @@ $sidebar-submenu-item-bg-color: #01287d;
padding-bottom: 6px;
padding-top: 6px;
}
.#{$ns}-menu-item {
padding: 7px 16px 7px 18px;
padding: 7px 16px;
font-size: 15px;
color: $sidebar-submenu-item-color;
@@ -116,7 +116,6 @@ $sidebar-submenu-item-bg-color: #01287d;
background: transparent;
color: $sidebar-submenu-item-hover-color;
}
&.bp3-active{
font-weight: 500;
}
@@ -173,7 +172,7 @@ $sidebar-submenu-item-bg-color: #01287d;
min-width: 50px;
&:hover{
min-width: 220px;
min-width: 190px;
.sidebar__head-logo{