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

Merge branch 'feature/landed-cost'

Browse Source
This commit is contained in:
a.bouhuolia
2021-07-27 05:49:20 +02:00
parent 49550b3393 3da7b53f5e
commit 720dc5b7d7
237 changed files with 5482 additions and 926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/style/components/DataTable/DataTableEditable.scss
View File

@@ -10,7 +10,7 @@
.th,
.td {
border-left: 1px dashed #e2e2e2;
border-left: 1px solid #e2e2e2;
&.index {
text-align: center;
@@ -55,6 +55,19 @@
margin-bottom: auto;
}
}
&.landed-cost{
.bp3-control{
margin-top: 0;
margin-left: 34px;
}
.bp3-control-indicator{
height: 18px;
width: 18px;
border-color: #e0e0e0;
}
}
}
.tr {
.bp3-form-group:not(.bp3-intent-danger) .bp3-input,

2
client/src/style/components/DataTable/Pagination.scss
View File

@@ -1,7 +1,7 @@
.pagination{
display: flex;
padding: 28px 14px;
padding: 20px 14px;
font-size: 13px;
.bp3-button{

21
client/src/style/components/Details.scss Normal file
View File

@@ -0,0 +1,21 @@
.details-menu {
display: flex;
flex-wrap: wrap;
justify-content: flex-start;
&.is-vertical {}
.detail-item {
&__label {
color: #666666;
font-weight: 500;
}
&__content {
text-transform: capitalize;
margin: 5px 0;
}
}
}

17
client/src/style/components/Drawer.scss Normal file
View File

@@ -0,0 +1,17 @@
.bp3-drawer {
.bp3-drawer-header {
margin-bottom: 2px;
background-color: #FFF;
.bp3-heading {
font-weight: 500;
}
.bp3-heading,
.bp3-icon {
color: #354152;
}
}
}

35
client/src/style/components/Drawer/AccountDrawer.scss → client/src/style/components/Drawers/AccountDrawer.scss
View File

@@ -1,14 +1,4 @@
.bp3-drawer-header {
box-shadow: 0 0 0;
.bp3-heading{
font-size: 16px;
}
.bp3-button{
min-height: 28px;
min-width: 28px;
}
}
.account-drawer {
background-color: #fbfbfb;
@@ -94,29 +84,4 @@
}
}
}
}
.bp3-drawer.bp3-position-right {
bottom: 0;
right: 0;
top: 0;
overflow: auto;
height: 100%;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
.bp3-drawer-header {
margin-bottom: 2px;
box-shadow: (0, 0, 0);
background-color: #6a7993;
.bp3-heading,
.bp3-icon {
color: white;
}
}
}

65
client/src/style/components/Drawers/BillDrawer.scss Normal file
View File

@@ -0,0 +1,65 @@
@import '../../Base.scss';
.bill-drawer {
.bp3-tabs {
.bp3-tab-list {
position: relative;
background-color: #FFF;
&:before {
content: '';
position: absolute;
bottom: 0;
width: 100%;
height: 2px;
background: #e1e2e8;
}
> *:not(:last-child) {
margin-right: 25px;
}
&.bp3-large > .bp3-tab {
font-size: 15px;
color: #555;
margin: 0 0.8rem;
&[aria-selected='true'],
&:not([aria-disabled='true']):hover {
color: $pt-link-color;
}
}
}
.bp3-tab-panel{
margin-top: 0;
.card{
margin: 15px;
}
}
}
.datatable--landed-cost-transactions {
.table {
.tbody,
.tbody-inner {
height: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
.tbody {
.tr .td {
padding: 0.6rem;
&.amount{
font-weight: 600;
}
}
}
}
}
}

1
client/src/style/components/Drawer/DrawerTemplate.scss → client/src/style/components/Drawers/DrawerTemplate.scss
View File

@@ -122,6 +122,7 @@
top: 0;
overflow: auto;
height: 100%;
.bp3-drawer-header .bp3-heading {
overflow: hidden;
text-overflow: ellipsis;

34
client/src/style/components/Drawer/ViewDetails.scss → client/src/style/components/Drawers/ViewDetails.scss
View File

@@ -1,6 +1,5 @@
.journal-drawer,
.expense-drawer {
background: #f5f5f5;
&__content {
display: flex;
@@ -18,8 +17,8 @@
justify-content: flex-start;
margin: 15px 0 20px;
font-size: 14px;
// color: #333333;
color: #666666;
> div {
flex-grow: 1;
span {
@@ -44,17 +43,17 @@
&--table {
flex-grow: 1;
flex-shrink: 0;
.table {
color: #666666;
font-size: 14px;
.thead .tr .th .resizer {
display: none;
}
.thead .th {
background: transparent;
color: #222222;
border-bottom: 1px solid #000000;
padding: 0.5rem;
}
.thead .th,
.tbody .tr .td {
background: transparent;
padding: 0.8rem 0.5rem;
@@ -63,7 +62,6 @@
.desc {
margin: 20px 0 60px;
// margin: 20px 0;
> b {
color: #2f2f2f;
}
@@ -93,25 +91,3 @@
}
}
}
.bp3-drawer.bp3-position-right {
bottom: 0;
right: 0;
top: 0;
overflow: auto;
height: 100%;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
.bp3-drawer-header {
margin-bottom: 2px;
box-shadow: (0, 0, 0);
background-color: #6a7993;
.bp3-heading,
.bp3-icon {
color: white;
}
}
}

63
client/src/style/pages/AllocateLandedCost/AllocateLandedCostForm.scss Normal file
View File

@@ -0,0 +1,63 @@
// Allocate Landed Cost Form.
.dialog--allocate-landed-cost-form {
width: 700px;
.bp3-dialog-body {
.bp3-form-group{
margin-bottom: 18px;
}
.bp3-form-group.bp3-inline {
.bp3-label {
min-width: 150px;
}
.bp3-form-content {
width: 300px;
}
&:not(.dialog--loading) .bp3-dialog-body {
margin-bottom: 30px;
}
}
}
.bp3-dialog-footer{
padding-top: 10px;
}
.bigcapital-datatable {
.table {
// max-height: 300px;
border: 1px solid #d1dee2;
min-width: auto;
.tbody,
.tbody-inner {
height: auto;
scrollbar-width: none;
&::-webkit-scrollbar {
display: none;
}
}
.tbody {
.tr .td {
padding: 0.4rem;
margin-left: -1px;
border-left: 1px solid #ececec;
}
.bp3-form-group{
margin-bottom: 0;
&:not(.bp3-intent-danger) .bp3-input{
border: 1px solid #d0dfe2;
&:focus{
box-shadow: 0 0 0 1px #116cd0;
border-color: #116cd0;
}
}
}
}
}
}
}

2
client/src/style/pages/Bills/List.scss
View File

@@ -2,7 +2,7 @@
.bigcapital-datatable {
.tbody {
.tr {
min-height: 50px;
min-height: 46px;
}
.td.amount {
.cell-inner {

3
client/src/style/pages/Bills/PageForm.scss
View File

@@ -11,7 +11,6 @@ body.page-bill-edit{
padding-bottom: 64px;
}
.page-form--bill{
$self: '.page-form';
@@ -36,7 +35,7 @@ body.page-bill-edit{
max-width: 440px;
}
&.form-group{
&.form-group{
&--expiration-date{
max-width: 340px;

4
client/src/style/pages/Customers/List.scss
View File

@@ -5,8 +5,8 @@
.bigcapital-datatable{
.tr .td{
padding-top: 0.6rem;
padding-bottom: 0.6rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}
.avatar.td{

2
client/src/style/pages/Expense/List.scss
View File

@@ -7,7 +7,7 @@
.tbody {
.tr{
min-height: 50px;
min-height: 46px;
}
.td.amount {
span {

59
client/src/style/pages/Expense/PageForm.scss
View File

@@ -1,11 +1,10 @@
.dashboard__insider--expenses {
.dashboard__insider--expenses{
.bigcapital-datatable {
.bigcapital-datatable{
.tbody{
.tr .td.total_amount{
span{
.tbody {
.tr .td.total_amount {
span {
font-weight: 600;
}
}
@@ -13,36 +12,64 @@
}
}
.page-form--expense{
.page-form--expense {
$self: '.page-form';
#{$self}__header{
#{$self}__header {
display: flex;
&-fields{
&-fields {
flex: 1 0 0;
}
.bp3-label{
.bp3-label {
min-width: 140px;
}
.bp3-form-content{
.bp3-form-content {
width: 100%;
}
.bp3-form-group{
.bp3-form-group {
margin-bottom: 18px;
&.bp3-inline{
max-width: 440px;
&.bp3-inline {
max-width: 440px;
}
}
}
.form-group--description{
.datatable-editor--expense-form {
.table {
.tbody {
.tr .td {
&.landed-cost {
.bp3-control {
margin-top: 0;
margin-left: 34px;
}
.bp3-control-indicator {
height: 18px;
width: 18px;
border-color: #e0e0e0;
}
}
}
}
}
}
.form-group--description {
max-width: 500px;
textarea{
textarea {
min-height: 60px;
width: 100%;
}

9
client/src/style/pages/FinancialStatements/ARAgingSummary.scss
View File

@@ -36,4 +36,13 @@
}
}
}
}
.financial-statement--AR-aging-summary{
.financial-header-drawer{
.bp3-drawer{
max-height: 450px;
}
}
}

20
client/src/style/pages/FinancialStatements/SalesAndPurchasesSheet.scss
View File

@@ -27,3 +27,23 @@
}
}
}
.financial-statement--sales-by-items,
.financial-statement--purchases-by-items{
.financial-header-drawer{
.bp3-drawer{
max-height: 400px;
}
}
}
.financial-statement--inventory-valuation{
.financial-header-drawer{
.bp3-drawer{
max-height: 350px;
}
}
}

2
client/src/style/pages/InventoryAdjustments/List.scss
View File

@@ -7,7 +7,7 @@
.table {
.tbody {
.tr{
min-height: 50px;
min-height: 46px;
}
}
}

2
client/src/style/pages/Items/List.scss
View File

@@ -7,7 +7,7 @@
.table {
.tbody {
.tr{
min-height: 50px;
min-height: 46px;
}
.item_type.td {
.bp3-tag {

2
client/src/style/pages/ItemsCategories/List.scss
View File

@@ -6,7 +6,7 @@
.table {
.tbody {
.tr{
min-height: 50px;
min-height: 46px;
}
}
}

2
client/src/style/pages/PaymentMade/List.scss
View File

@@ -5,7 +5,7 @@
.tbody{
.tr{
min-height: 50px;
min-height: 46px;
}
.td.amount {

2
client/src/style/pages/PaymentReceive/List.scss
View File

@@ -5,7 +5,7 @@
.tbody{
.tr .td{
min-height: 50px;
min-height: 46px;
}
.td.amount {

3
client/src/style/pages/SaleEstimate/List.scss
View File

@@ -4,6 +4,9 @@
.bigcapital-datatable{
.tbody{
.tr{
min-height: 46px;
}
.tr .td{
padding-top: 0.88rem;

2
client/src/style/pages/SaleInvoice/List.scss
View File

@@ -8,7 +8,7 @@
.tbody{
.tr{
min-height: 50px;
min-height: 46px;
}
.balance.td{

5
client/src/style/pages/SaleReceipt/List.scss
View File

@@ -4,9 +4,8 @@
.bigcapital-datatable{
.tbody{
.tr .td{
min-height: 50px;
.tr{
min-height: 46px;
}
.td.amount {

3
client/src/style/pages/Setup/SetupPage.scss
View File

@@ -101,6 +101,9 @@
opacity: 0.75;
padding-bottom: 5px;
border-bottom: 1px solid rgba(255, 255, 255, 0.15);
p > span {
unicode-bidi: plaintext;
}
}
&__links {

4
client/src/style/pages/Vendors/List.scss
View File

@@ -4,8 +4,8 @@
tbody {
.tr .td {
padding-top: 0.6rem;
padding-bottom: 0.6rem;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
}
}

46
client/src/style/pages/fonts.scss
View File

@@ -1,3 +1,7 @@
// Noto Sans
// -------------------------------------
@font-face {
font-family: Noto Sans;
src: local('Noto Sans'), url('../fonts/NotoSans-SemiBold.woff') format('woff');
@@ -30,46 +34,8 @@
font-display: swap;
}
// arabic regular
@font-face {
font-family: Noto Sans Arabic;
src: local('Noto Sans'),
url('../fonts/NotoSansArabicUI-SemiCondensed.woff') format('woff');
font-style: normal;
font-weight: 400;
font-display: swap;
}
// arabic black
@font-face {
font-family: Noto Sans Arabic;
src: local('Noto Sans'),
url('../fonts/NotoSansArabicUI-SemiCondensedBlack.woff') format('woff');
font-style: normal;
font-weight: 900;
font-display: swap;
}
//arabic Medium
@font-face {
font-family: Noto Sans Arabic;
src: local('Noto Sans'),
url('../fonts/NotoSansArabicUI-SemiCondensedMedium.woff') format('woff');
font-style: normal;
font-weight: 500;
font-display: swap;
}
//arabic SemiBold
@font-face {
font-family: Noto Sans Arabic;
src: local('Noto Sans'),
url('../fonts/NotoSansArabicUI-SemiCondensedSemiBold.woff') format('woff');
font-style: normal;
font-weight: 600;
font-display: swap;
}
// Segoe UI Arabic
// -------------------------------------
// Segoe UI Arabic - Regular
@font-face {
font-family: 'Segoe UI';

2
client/src/style/variables.scss
View File

@@ -16,7 +16,7 @@ $menu-item-color-active: $light-gray3;
$breadcrumbs-collapsed-icon: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='#6B8193' enable-background='new 0 0 16 16' xml:space='preserve'><g><circle cx='2' cy='8.03' r='2'/><circle cx='14' cy='8.03' r='2'/><circle cx='8' cy='8.03' r='2'/></g></svg>");
$sidebar-zindex: 15;
$pt-font-family: 'Segoe UI', -apple-system, BlinkMacSystemFont,
$pt-font-family: 'Noto Sans', -apple-system, BlinkMacSystemFont,
Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue,
Icons16, sans-serif;