fix: merge conflict quick create list field.

This commit is contained in:
a.bouhuolia
2021-11-11 00:05:57 +02:00
61 changed files with 1885 additions and 745 deletions

View File

@@ -0,0 +1,157 @@
@import '../../Base.scss';
.page-form--customer {
$self: '.page-form';
padding: 20px;
#{$self}__header {
padding: 0;
}
#{$self}__primary-section {
padding: 10px 0 0;
margin: 0 0 20px;
overflow: hidden;
border-bottom: 1px solid #e4e4e4;
max-width: 1000px;
}
.bp3-form-group {
max-width: 500px;
.bp3-control {
margin-top: 8px;
margin-bottom: 8px;
}
&.bp3-inline {
.bp3-label {
min-width: 150px;
}
}
.bp3-form-content {
width: 100%;
}
}
.form-group--contact_name {
max-width: 600px;
.bp3-control-group > * {
flex-shrink: unset;
&:not(:last-child) {
padding-right: 10px;
}
&.input-group--salutation-list {
width: 25%;
}
&.input-group--first-name,
&.input-group--last-name {
width: 37%;
}
}
}
.bp3-form-group {
margin-bottom: 14px;
}
.bp3-tab-panel {
margin-top: 26px;
}
.form-group--phone-number {
.bp3-control-group > * {
flex-shrink: unset;
padding-right: 5px;
padding-left: 5px;
&:first-child {
padding-left: 0;
}
&:last-child {
padding-right: 0;
}
}
}
#{$self}__tabs {
margin-top: 20px;
max-width: 1000px;
h4 {
font-weight: 500;
color: #888;
margin-bottom: 1.2rem;
font-size: 14px;
}
// Tab panels.
.tab-panel {
&--address {
.bp3-form-group {
max-width: 440px;
&.bp3-inline {
.bp3-label {
min-width: 145px;
}
}
.bp3-form-content {
width: 100%;
}
textarea.bp3-input {
max-width: 100%;
width: 100%;
min-height: 50px;
}
}
}
&--note {
.form-group--note {
.bp3-form-group {
max-width: 600px;
}
textarea {
width: 100%;
min-height: 100px;
}
}
}
}
.dropzone-container {
max-width: 600px;
}
}
.bp3-tabs {
.bp3-tab-list {
position: relative;
&:before {
content: '';
position: absolute;
bottom: 0;
width: 100%;
height: 2px;
background: #f0f0f0;
}
> *:not(:last-child) {
margin-right: 25px;
}
&.bp3-large > .bp3-tab {
font-size: 15px;
color: #555;
&[aria-selected='true'],
&:not([aria-disabled='true']):hover {
color: $pt-link-color;
}
}
}
}
}

View File

@@ -1,16 +1,4 @@
body.page-item-new,
body.page-item-edit{
.dashboard__footer{
display: none;
}
}
.dashboard__insider--item-form{
padding-bottom: 64px;
}
.page-form--item {
$self: '.page-form';
padding: 20px;
@@ -85,18 +73,14 @@ body.page-item-edit{
}
#{$self}__floating-actions {
margin-left: -40px;
margin-right: -40px;
// margin-left: -40px;
// margin-right: -40px;
.form-group--active {
display: inline-block;
margin: 0;
margin-left: 40px;
}
.btn--submit{
min-width: 65px;
}
}
.bp3-tooltip-indicator {

View File

@@ -1,13 +1,11 @@
body.page-invoice-new,
body.page-invoice-edit{
.dashboard__footer{
body.page-invoice-edit {
.dashboard__footer {
display: none;
}
}
.dashboard__insider--invoice-form{
.dashboard__insider--invoice-form {
padding-bottom: 64px;
}
@@ -29,7 +27,6 @@ body.page-invoice-edit{
}
.bp3-form-group {
&.bp3-inline {
max-width: 450px;
}

View File

@@ -1,19 +1,6 @@
@import '../../Base.scss';
body.page-customer-new,
body.page-customer-edit{
.dashboard__footer{
display: none;
}
}
.dashboard__insider--customer-form{
padding-bottom: 64px;
}
.page-form--customer {
.page-form--vendor {
$self: '.page-form';
padding: 20px;
@@ -169,7 +156,7 @@ body.page-customer-edit{
}
#{$self}__floating-actions {
margin-left: -40px;
margin-right: -40px;
// margin-left: -40px;
// margin-right: -40px;
}
}

View File

@@ -10,166 +10,4 @@ body.page-vendor-edit{
.dashboard__insider--vendor-form{
padding-bottom: 64px;
}
.page-form--vendor {
$self: '.page-form';
padding: 20px;
#{$self}__header {
padding: 0;
}
#{$self}__primary-section {
padding: 10px 0 0;
margin: 0 0 20px;
overflow: hidden;
border-bottom: 1px solid #e4e4e4;
max-width: 1000px;
}
.bp3-form-group {
max-width: 500px;
.bp3-control {
margin-top: 8px;
margin-bottom: 8px;
}
&.bp3-inline {
.bp3-label {
min-width: 150px;
}
}
.bp3-form-content {
width: 100%;
}
}
.form-group--contact_name {
max-width: 600px;
.bp3-control-group > * {
flex-shrink: unset;
&:not(:last-child) {
padding-right: 10px;
}
&.input-group--salutation-list {
width: 25%;
}
&.input-group--first-name,
&.input-group--last-name {
width: 37%;
}
}
}
.bp3-form-group {
margin-bottom: 14px;
}
.bp3-tab-panel {
margin-top: 26px;
}
.form-group--phone-number {
.bp3-control-group > * {
flex-shrink: unset;
padding-right: 5px;
padding-left: 5px;
&:first-child {
padding-left: 0;
}
&:last-child {
padding-right: 0;
}
}
}
#{$self}__tabs {
margin-top: 20px;
max-width: 1000px;
h4 {
font-weight: 500;
color: #888;
margin-bottom: 1.2rem;
font-size: 14px;
}
// Tab panels.
.tab-panel {
&--address {
.bp3-form-group {
max-width: 440px;
&.bp3-inline {
.bp3-label {
min-width: 145px;
}
}
.bp3-form-content {
width: 100%;
}
textarea.bp3-input {
max-width: 100%;
width: 100%;
min-height: 50px;
}
}
}
&--note {
.form-group--note {
.bp3-form-group {
max-width: 600px;
}
textarea {
width: 100%;
min-height: 100px;
}
}
}
}
.dropzone-container {
max-width: 600px;
}
}
.bp3-tabs {
.bp3-tab-list {
position: relative;
&:before {
content: '';
position: absolute;
bottom: 0;
width: 100%;
height: 2px;
background: #f0f0f0;
}
> *:not(:last-child) {
margin-right: 25px;
}
&.bp3-large > .bp3-tab {
font-size: 15px;
color: #555;
&[aria-selected='true'],
&:not([aria-disabled='true']):hover {
color: $pt-link-color;
}
}
}
}
#{$self}__floating-actions {
margin-left: -40px;
margin-right: -40px;
}
}
}