FIX_merge files
This commit is contained in:
parent
e270ff2bcd
commit
8915bc05e2
@ -23,31 +23,14 @@
|
|||||||
.from-address {
|
.from-address {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
float: left;
|
float: left;
|
||||||
<<<<<<< HEAD
|
|
||||||
width: 100%;
|
width: 100%;
|
||||||
=======
|
|
||||||
width: 60%;
|
|
||||||
|
|
||||||
}
|
|
||||||
.order-number {
|
|
||||||
text-align: right;
|
|
||||||
float: right;
|
|
||||||
width: 40%;
|
|
||||||
>>>>>>> 37dc008a4e67eb19b144ea570725193f87907964
|
|
||||||
}
|
}
|
||||||
.to-address {
|
.to-address {
|
||||||
|
|
||||||
float: right;
|
float: right;
|
||||||
<<<<<<< HEAD
|
|
||||||
width: 40%;
|
width: 40%;
|
||||||
clear: both;
|
clear: both;
|
||||||
/* margin-top: 20px; Adjust for spacing in landscape */
|
/* margin-top: 20px; Adjust for spacing in landscape */
|
||||||
=======
|
|
||||||
width: 30%;
|
|
||||||
clear: both;
|
|
||||||
margin-top: 20px; /* Adjust for spacing in landscape */
|
|
||||||
/* padding-right: -200px; */
|
|
||||||
>>>>>>> 37dc008a4e67eb19b144ea570725193f87907964
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user