QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 05:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: expand sidebar once open form editor page.

Browse Source 
feat: rounding money amount.
feat: optimize page form structure.
feat: refactoring make journal and expense form with FastField component.
This commit is contained in:
Ahmed Bouhuolia
2020-11-29 00:06:59 +02:00
parent 53dd447540
commit 011542e2a3
118 changed files with 3883 additions and 2660 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
client/src/style/App.scss
View File

@@ -220,49 +220,65 @@ body.authentication {
// .page-form__content
// .page-form__floating-actions
.page-form{
$self: '.page-form';
padding-bottom: 20px;
&__header{
background-color: #fbfbfb;
padding: 30px 20px 20px;
padding-bottom: 6px;
}
&__primary-section{
}
&__header-fields{
width: 85%;
}
&__footer{
padding: 15px;
margin: 15px 0 0 0;
}
&__floating-actions{
position: fixed;
bottom: 0;
width: 100%;
background: #fff;
padding: 14px 18px;
border-top: 1px solid #ececec;
border-top: 1px solid rgba(0, 0, 0, 0.05);
box-shadow: 0px -1px 4px 0px rgba(0, 0, 0, 0.05);
}
&--strip{
#{$self}__header-fields{
width: 85%;
}
#{$self}__body,
#{$self}__footer{
max-width: 1200px;
}
#{$self}__header{
background-color: #fbfbfb;
padding: 30px 20px 0;
border-bottom: 1px solid #d2dce2;
.bp3-form-group.bp3-inline label.bp3-label{
font-weight: 500;
}
}
#{$self}__body{
padding-top: 15px;
padding-left: 20px;
padding-right: 20px;
}
#{$self}__footer{
margin: 25px 0 0 0;
padding-left: 20px;
padding-right: 20px;
}
}
}
.datatable-editor{
padding: 15px 15px 0;
.bp3-form-group {
margin-bottom: 0;
}
.bp3-form-group {
margin-bottom: 0;
}
.table {
border: 1px solid #d2dce2;
border-bottom: transparent;
border-left: transparent;
.th,
.td {
border-left: 1px dotted rgb(195, 195, 195);
border-left: 1px solid #e2e2e2;
&.index {
text-align: center;
@@ -281,10 +297,10 @@ body.authentication {
.thead {
.tr .th {
padding: 10px 10px;
background-color: #f2f5fa;
background-color: #f0f2f8;
font-size: 14px;
font-weight: 500;
color: #1e1c3e;
color: #1c1940;
&.index > div {
width: 100%;
@@ -294,12 +310,13 @@ body.authentication {
.tbody {
.tr .td {
padding: 7px;
border-bottom: 1px dotted rgb(195, 195, 195);
min-height: 46px;
padding: 5px;
border-bottom: 0;
border-top: 1px dashed #AAA;
min-height: 42px;
&.index {
background-color: #f2f5fa;
background-color: #f0f2f8;
> span {
margin-top: auto;
@@ -310,23 +327,48 @@ body.authentication {
.tr {
.bp3-form-group:not(.bp3-intent-danger) .bp3-input,
.form-group--select-list .bp3-button {
border-color: #e5e5e5;
border-color: #ffffff;
color: #222;
border-radius: 3px;
padding-left: 8px;
padding-right: 8px;
}
.form-group--select-list {
.bp3-form-group:not(.bp3-intent-danger) .bp3-input{
border-radius: 2px;
padding-left: 4px;
padding-right: 4px;
&:focus{
box-shadow: 0 0 0 2px #116cd0;
}
}
.form-group--select-list .bp3-button{
padding-left: 6px;
padding-right: 6px;
&:after{
display: none;
}
}
.form-group--select-list,
.bp3-form-group {
&.bp3-intent-danger {
.bp3-button:not(.bp3-minimal) {
border-color: #db3737;
.bp3-button:not(.bp3-minimal),
.bp3-input {
border-color: #F7B6B6;
}
}
}
&:first-of-type{
.td{
border-top: 0;
}
}
&:last-of-type {
.td {
border-bottom: transparent;
.bp3-button,
.bp3-input-group {
@@ -351,6 +393,7 @@ body.authentication {
}
&.row--total {
.account.td,
.debit.td,
.credit.td {
@@ -373,6 +416,7 @@ body.authentication {
width: 100%;
}
}
}
}
}
@@ -408,6 +452,7 @@ body.authentication {
}
&__actions{
margin-top: 12px;
.bp3-button{
padding-left: 10px;
@@ -421,9 +466,30 @@ body.authentication {
}
}
}
}
&.has-total-row{
.table .tbody-inner .tr:last-of-type{
.td{
border-top-width: 2px;
border-top-color: #E9E9EF;
border-top-style: solid;
min-height: 40px;
&:not(.index) {
background-color: #FCFCFD;
}
&.index span{
display: none;
}
}
}
}
}
.cloud-spinner{
position: relative;
@@ -482,7 +548,6 @@ body.authentication {
}
}
.datatable-empty-status{
max-width: 550px;
width: 100%;
@@ -517,4 +582,9 @@ body.authentication {
}
}
}
}
.dropzone-container{
max-width: 250px;
margin-left: auto;
}

4
client/src/style/components/data-table.scss
View File

@@ -142,6 +142,10 @@
.placeholder{
color: #A0A0A0;
}
.bp3-form-group{
width: 100%;
}
}
.tr:hover .td{
background: #f3f7fc;

22
client/src/style/objects/buttons.scss
View File

@@ -1,14 +1,21 @@
.form-group--select-list.bp3-fill{
.form-group--select-list{
.bp3-popover-wrapper{
&,
.bp3-popover-target{
width: 100%;
.bp3-popover-target{
.bp3-icon{
position: absolute;
top: 0;
left: 0;
margin: 7px;
+ .bp3-button-text{
padding-left: 20px;
}
}
.bp3-button{
width: 100%;
justify-content: space-between;
padding-left: 10px;
color: #333;
}
}
@@ -18,6 +25,7 @@
.bp3-popover-open{
.bp3-button{
border-color: #80bdff;
}
}

6
client/src/style/pages/accounts-chart.scss
View File

@@ -4,7 +4,7 @@
.bigcapital-datatable{
.normal{
.#{$ns}-icon{
color: #838d9b;
color: #6E8091;
padding-left: 15px;
}
}
@@ -12,8 +12,8 @@
.table{
.tbody{
.tr:not(.no-results) .td{
padding-top: 0.36rem;
padding-bottom: 0.36rem;
padding-top: 0.3rem;
padding-bottom: 0.3rem;
}
.account_name{
> div{

18
client/src/style/pages/bills.scss
View File

@@ -7,6 +7,11 @@
#{$self}__header{
display: flex;
&-fields{
flex: 1 0 0;
}
.bp3-form-group{
margin-bottom: 18px;
}
@@ -19,21 +24,10 @@
.bp3-form-group{
&.bp3-inline{
max-width: 420px;
max-width: 440px;
}
&.form-group{
&--vendor{
max-width: 650px
}
&--due-date{
max-width: 300px;
.bp3-label{
min-width: 95px;
}
}
&--expiration-date{
max-width: 340px;

2
client/src/style/pages/dashboard.scss
View File

@@ -10,7 +10,7 @@
display: flex;
justify-content: space-between;
background-color: #fff;
border-bottom: 1px solid #F2EFEF;
border-bottom: 1px solid #dddee3;
&-right,
&-left{

2
client/src/style/pages/estimate.scss
View File

@@ -6,6 +6,7 @@
padding-bottom: 30px;
display: flex;
flex-direction: column;
.bp3-form-group {
width: 100%;
margin: 25px 20px 15px;
@@ -23,6 +24,7 @@
width: 120%;
}
}
&__table {
padding: 15px 15px 0;

29
client/src/style/pages/estimates.scss
View File

@@ -6,6 +6,11 @@
$self: '.page-form';
#{$self}__header{
display: flex;
&-fields{
flex: 1 0 0;
}
.bp3-form-group{
margin-bottom: 18px;
@@ -20,31 +25,9 @@
.bp3-form-group{
&.bp3-inline{
max-width: 420px;
max-width: 440px;
}
}
.bp3-form-group{
&.form-group{
&--customer{
max-width: 650px;
}
&--expiration-date{
max-width: 340px;
.bp3-label{
min-width: 120px;
}
}
}
}
.col--estimate-date{
max-width: 435px;
}
}

257
client/src/style/pages/expense-form.scss
View File

@@ -1,239 +1,38 @@
.dashboard__insider--expense-form {
padding-bottom: 80px;
display: flex;
flex-direction: column;
background: #fff;
&__header {
padding: 25px 27px 20px;
background: #fbfbfb;
width: 100%;
.bp3-form-group {
.bp3-label {
font-weight: 500;
font-size: 13px;
color: #444;
}
.bp3-form-content {
.bp3-button:not([class*='bp3-intent-']):not(.bp3-minimal) {
}
}
.bp3-input-group {
}
&.form-group--ref_no {
.bp3-input-group .bp3-input {
}
}
}
.form-group--payment_account {
.bp3-form-group {
}
.bp3-form-content {
.bp3-button:not([class*='bp3-intent-']):not(.bp3-minimal) {
}
}
}
.form-group--currency {
.bp3-form-group {
}
.bp3-form-content {
.bp3-button:not([class*='bp3-intent-']):not(.bp3-minimal) {
}
}
}
}
&__table {
padding: 15px 15px 0;
.bp3-form-group {
margin-bottom: 0;
}
.table {
border: 1px solid #d2dce2;
border-bottom: transparent;
border-left: transparent;
.th,
.td {
border-left: 1px dotted rgb(195, 195, 195);
&.index {
> span,
> div {
text-align: center;
width: 100%;
font-weight: 500;
}
}
&:first-child{
border-left: 1px solid #d2dce2;
}
}
.thead {
.tr .th {
padding: 10px 10px;
background-color: #f2f5fa;
font-size: 14px;
font-weight: 500;
color: #333;
}
}
.tbody {
.tr .td {
padding: 7px;
border-bottom: 1px dotted rgb(195, 195, 195);
min-height: 46px;
&.index {
background-color: #f2f5fa;
text-align: center;
> span {
margin-top: auto;
margin-bottom: auto;
}
}
}
.tr {
.bp3-form-group .bp3-input,
.form-group--select-list .bp3-button {
border-radius: 3px;
padding-left: 8px;
padding-right: 8px;
}
.bp3-form-group:not(.bp3-intent-danger) .bp3-input,
.form-group--select-list:not(.bp3-intent-danger) .bp3-button {
border-color: #E5E5E5;
}
&:last-of-type {
.td {
border-bottom: transparent;
.bp3-button,
.bp3-input-group {
display: none;
}
}
}
.td.actions {
.bp3-button {
background-color: transparent;
color: #e68f8e;
&:hover {
color: #c23030;
}
}
}
&.row--total {
.td.amount{
font-weight: bold;
}
}
}
}
.th {
color: #444;
font-weight: 600;
border-bottom: 1px dotted #666;
}
.td {
border-bottom: 1px dotted #999;
&.description{
.bp3-form-group{
width: 100%;
}
}
}
.actions.td {
.bp3-button {
background: transparent;
margin: 0;
}
}
}
}
.bp3-button {
&.button--clear-lines {
background-color: #fcefef;
}
}
.button--clear-lines,
.button--new-line {
padding-left: 14px;
padding-right: 14px;
}
.dropzone-container {
margin-top: 0;
align-self: flex-end;
}
.dropzone {
width: 300px;
height: 75px;
}
.expense-form-footer{
display: flex;
padding: 30px 25px 0;
justify-content: space-between;
}
.form-group--description {
.bp3-label {
font-weight: 500;
font-size: 13px;
color: #444;
}
.bp3-form-content {
// width: 280px;
textarea {
width: 450px;
min-height: 75px;
}
}
}
.dashboard__insider--expense-form{
background-color: #fff;
}
.page-form--expense{
$self: '.page-form';
#{$self}__header{
display: flex;
.dashboard__insider--expenses{
&-fields{
flex: 1 0 0;
}
.bigcapital-datatable{
.bp3-label{
min-width: 140px;
}
.bp3-form-content{
width: 100%;
}
.tbody{
.total_amount{
font-weight: 600;
.bp3-form-group{
margin-bottom: 18px;
&.bp3-inline{
max-width: 440px;
}
}
}
.td.description{
.bp3-icon{
color: #666;
}
.bp3-tooltip-indicator{
cursor: initial;
border-bottom: 0;
}
}
.form-group--description{
max-width: 500px;
textarea{
min-height: 60px;
width: 100%;
}
}
}

22
client/src/style/pages/invoice-form.scss
View File

@@ -6,6 +6,12 @@
$self: '.page-form';
#{$self}__header{
display: flex;
&-fields{
flex: 1 0 0;
}
.bp3-label{
min-width: 140px;
}
@@ -17,23 +23,9 @@
margin-bottom: 18px;
&.bp3-inline{
max-width: 420px;
}
&.form-group{
&--customer-name{
max-width: 600px
}
&--due-date{
max-width: 300px;
.bp3-label{
min-width: 95px;
}
}
max-width: 440px;
}
}
.col--invoice-date{
max-width: 435px;
}

55
client/src/style/pages/make-journal-entries.scss
View File

@@ -1,49 +1,34 @@
.make-journal-entries {
padding-bottom: 20px;
display: flex;
flex-direction: column;
&__header {
padding: 25px 27px 20px;
background: #fbfbfb;
.page-form--make-journal-entries{
$self: '.page-form';
.bp3-form-group {
.bp3-label {
font-weight: 500;
font-size: 13px;
color: #444;
#{$self}__header{
.bp3-label{
min-width: 140px;
}
.bp3-form-content{
width: 100%;
}
.bp3-form-group{
margin-bottom: 18px;
&.bp3-inline{
max-width: 440px;
}
}
}
&__table {
}
.form-group--description{
max-width: 500px;
.bp3-button {
&.button--clear-lines {
background-color: #fcefef;
textarea{
min-height: 60px;
width: 100%;
}
}
.button--clear-lines,
.button--new-line {
padding-left: 14px;
padding-right: 14px;
}
.dropzone-container {
margin-left: auto;
}
.dropzone {
width: 300px;
height: 75px;
margin-right: 20px;
}
}
.dialog--journal-number-settings{
.paragraph {

1
client/src/style/pages/payment-made.scss
View File

@@ -42,7 +42,6 @@
.table .tbody{
.tr.no-results{
.td{
border-bottom: 1px solid #e2e2e2;
font-size: 15px;
padding: 26px 0;
color: #5a5a77;

1
client/src/style/pages/payment-receive.scss
View File

@@ -43,7 +43,6 @@
.table .tbody{
.tr.no-results{
.td{
border-bottom: 1px solid #e2e2e2;
font-size: 15px;
padding: 26px 0;
color: #5a5a77;

11
client/src/style/pages/receipt-form.scss
View File

@@ -6,6 +6,11 @@
$self: '.page-form';
#{$self}__header{
display: flex;
&-fields{
flex: 1 0 0;
}
.bp3-label{
min-width: 140px;
}
@@ -19,12 +24,6 @@
&.bp3-inline{
max-width: 450px;
}
&.form-group{
&--customer{
max-width: 600px
}
}
}
}

6
client/src/style/views/Sidebar.scss
View File

@@ -65,7 +65,7 @@ $sidebar-submenu-item-bg-color: #01287d;
.#{$ns}-menu-item {
color: $sidebar-menu-item-color;
border-radius: 0;
padding: 8px 16px;
padding: 8px 18px;
font-size: 15px;
font-weight: 400;
@@ -93,7 +93,7 @@ $sidebar-submenu-item-bg-color: #01287d;
display: block;
color: $sidebar-menu-label-color;
font-size: 12px;
padding: 6px 16px;
padding: 6px 18px;
margin-top: 4px;
}
@@ -137,7 +137,7 @@ $sidebar-submenu-item-bg-color: #01287d;
color: $sidebar-menu-item-color;
}
.#{$ns}-menu-divider {
border-top-color: rgba(255, 255, 255, 0.125);
border-top-color: rgba(255, 255, 255, 0.15);
color: #6b708c;
margin: 4px 0;
}