1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00

Merge pull request #4270 from beganovich/v5-designs-update-for-tasks

(v5) Update designs to support tasks
This commit is contained in:
David Bomba 2020-11-06 07:57:39 +11:00 committed by GitHub
commit b909c85517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 193 additions and 119 deletions

View File

@ -82,7 +82,8 @@
padding-bottom: 0.5rem;
}
#product-table {
#product-table,
#task-table {
min-width: 100%;
table-layout: fixed;
overflow-wrap: break-word;
@ -90,40 +91,47 @@
margin-bottom: 200px;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
padding: 2rem;
font-size: 1.5rem;
}
#product-table > thead > tr > th:last-child {
#product-table > thead > tr > th:last-child,
#task-table > thead > tr > th:last-child {
text-align: right;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
padding: 1.5rem;
}
#product-table > tbody > tr > td:last-child {
#product-table > tbody > tr > td:last-child,
#task-table > tbody > tr > td:last-child {
text-align: right;
}
#product-table > tbody > tr > td:first-child {
#product-table > tbody > tr > td:first-child,
#task-table > tbody > tr > td:first-child {
font-weight: bold;
}
#product-table > tbody > tr:nth-child(odd) {
#product-table > tbody > tr:nth-child(odd),
#task-table > tbody > tr:nth-child(odd) {
background-color: #ebebeb;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
padding-top: .5rem;
@ -131,23 +139,23 @@
gap: 20px;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
font-size: 1.4rem;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
color: var(--primary-color);
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1.5rem;
}
@ -177,8 +185,9 @@
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<div id="footer"></div>

View File

@ -92,7 +92,8 @@
font-weight: normal;
}
#product-table {
#product-table,
#task-table {
margin-top: 3.5rem;
margin-bottom: 200px;
min-width: 100%;
@ -100,44 +101,54 @@
overflow-wrap: break-word;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
background: var(--secondary-color);
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
padding: 1rem;
color: white;
font-weight: semibold;
}
#product-table > thead > tr > th:first-child {
#product-table > thead > tr > th:first-child,
#task-table > thead > tr > th:first-child {
border-top-left-radius: 1rem;
}
#product-table > thead > tr > th:last-child {
#product-table > thead > tr > th:last-child,
#task-table > thead > tr > th:last-child {
border-top-right-radius: 1rem;
text-align: right;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
padding: 1rem;
}
#product-table > tbody > tr > td:last-child {
#product-table > tbody > tr > td:last-child,
#task-table > tbody > tr > td:last-child {
text-align: right;
}
#product-table > tbody > tr:nth-child(odd) > td {
#product-table > tbody > tr:nth-child(odd) > td,
#task-table > tbody > tr:nth-child(odd) > td {
background: #e8e8e8;
}
#product-table > tbody > tr:nth-child(even) > td {
#product-table > tbody > tr:nth-child(even) > td,
#task-table > tbody > tr:nth-child(even) > td {
background: #f7f7f7;
}
[data-element='product-table-balance-due-label'],
[data-element='product-table-balance-due'] {
[data-element='product-table-balance-due'],
[data-element='task-table-balance-due-label'],
[data-element='task-table-balance-due'] {
color: var(--secondary-color) !important;
font-weight: bold !important;
}
@ -149,16 +160,16 @@
}
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > *:last-child {
#table-totals > *:last-child {
border-bottom-left-radius: 1rem;
border-bottom-right-radius: 1rem;
}
#product-table-footer > * {
#table-totals > * {
background-color: #f7f7f7;
display: grid;
grid-template-columns: 3fr 1fr 1fr;
@ -168,23 +179,23 @@
padding-bottom: 0.8rem;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
font-size: 1.2rem;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
color: red;
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1rem;
}
@ -215,7 +226,9 @@
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<div id="footer"></div>

View File

@ -77,7 +77,8 @@
font-weight: bold;
}
#product-table {
#product-table,
#task-table {
margin-top: 3rem;
margin-bottom: 200px;
min-width: 100%;
@ -85,34 +86,39 @@
overflow-wrap: break-word;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
font-size: 1.1rem;
padding-bottom: 1.5rem;
padding-left: 1rem;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
border-bottom: 1px solid #9f9f9f;
padding: 1rem;
}
#product-table > tbody > tr > td:first-child {
#product-table > tbody > tr > td:first-child,
#task-table > tbody > tr > td:first-child {
color: var(--primary-color);
}
#product-table > tbody > tr:nth-child(odd) {
#product-table > tbody > tr:nth-child(odd),
#task-table > tbody > tr:nth-child(odd) {
background-color: #f5f5f5;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
padding-top: .5rem;
@ -120,22 +126,22 @@
gap: 20px;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
color: var(--primary-color);
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1rem;
}
@ -163,7 +169,10 @@
</div>
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<div id="footer"></div>

View File

@ -86,7 +86,8 @@
font-weight: normal;
}
#product-table {
#product-table,
#task-table {
margin-top: 3rem;
margin-bottom: 200px;
min-width: 100%;
@ -95,58 +96,64 @@
border-top: 5px solid var(--primary-color);
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
font-size: 1.1rem;
padding: 1rem;
}
#product-table > thead > tr > th:last-child {
#product-table > thead > tr > th:last-child,
#task-table > thead > tr > th:last-child {
text-align: right;
}
#product-table > tbody > tr > td:last-child {
#product-table > tbody > tr > td:last-child,
#task-table > tbody > tr > td:last-child {
text-align: right;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
padding: 1rem;
}
#product-table > tbody > tr:nth-child(odd) {
#product-table > tbody > tr:nth-child(odd),
#task-table > tbody > tr:nth-child(odd) {
background-color: #e8e8e8;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
padding-top: 1rem;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
color: var(--primary-color);
}
#product-table-footer > * > * {
#table-totals > * > * {
padding-left: 1rem;
}
#product-table-footer > *:last-child > * {
#table-totals > *:last-child > * {
border-top: 5px solid var(--primary-color);
padding-top: 1rem;
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1rem;
}
@ -181,7 +188,9 @@
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<div id="footer"></div>

View File

@ -79,7 +79,8 @@
font-weight: normal;
}
#product-table {
#product-table,
#task-table {
margin-top: 3rem;
margin-bottom: 200px;
min-width: 100%;
@ -87,11 +88,13 @@
overflow-wrap: break-word;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
font-size: 1.1rem;
padding-bottom: 1.5rem;
padding-left: 1rem;
@ -99,16 +102,19 @@
font-weight: bold;
}
#product-table > thead > tr > th:last-child {
#product-table > thead > tr > th:last-child,
#task-table > thead > tr > th:last-child {
text-align: right;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
border-bottom: 1px solid;
padding: 1rem;
}
#product-table > tbody > tr > td:last-child {
#product-table > tbody > tr > td:last-child,
#task-table > tbody > tr > td:last-child {
text-align: right;
}
@ -121,11 +127,11 @@
border-bottom: 4px solid;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
padding-top: 0.5rem;
@ -133,22 +139,22 @@
gap: 20px;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
color: var(--primary-color);
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 0.5rem;
}
@ -189,7 +195,9 @@
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<p class="thanks-label">$thanks_label!</p>

View File

@ -97,7 +97,8 @@
font-weight: bold;
}
#product-table {
#product-table,
#task-table {
margin-top: 3rem;
margin-bottom: 200px;
min-width: 100%;
@ -105,37 +106,42 @@
overflow-wrap: break-word;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
text-transform: uppercase;
font-weight: bold;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
font-size: 1.1rem;
padding-bottom: 1.5rem;
padding-left: 1rem;
border-left: 1px solid;
}
#product-table > thead > tr > th:last-child {
#product-table > thead > tr > th:last-child,
#task-table > thead > tr > th:last-child {
text-align: right;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
padding: 1rem;
border-left: 1px solid;
}
#product-table > tbody > tr td:last-child {
#product-table > tbody > tr td:last-child,
#task-table > tbody > tr td:last-child {
text-align: right;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
padding-top: 0.5rem;
@ -143,22 +149,22 @@
gap: 20px;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
color: var(--primary-color);
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1rem;
}
@ -218,7 +224,9 @@
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<div id="footer"></div>

View File

@ -70,36 +70,43 @@
margin: 3rem 1.5rem;
}
#product-table {
#product-table,
#task-table {
min-width: 100%;
table-layout: fixed;
overflow-wrap: break-word;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
padding: 0.8rem;
background-color: var(--secondary-color);
color: white;
}
#product-table > thead > tr > th:last-child {
#product-table > thead > tr > th:last-child,
#task-table > thead > tr > th:last-child {
text-align: right;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
border-bottom: 1px solid var(--secondary-color);
padding: 1rem;
}
#product-table > tbody > tr > td:first-child {
#product-table > tbody > tr > td:first-child,
#task-table > tbody > tr > td:first-child {
font-weight: bold;
}
#product-table > tbody > tr > td:last-child {
#product-table > tbody > tr > td:last-child,
#task-table > tbody > tr > td:last-child {
text-align: right;
}
@ -134,11 +141,11 @@
margin-bottom: 0.5rem;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
margin-top: 0.5rem;
@ -146,26 +153,26 @@
margin-left: 1.5rem;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
font-size: 1.3rem;
}
#product-table-footer > * > * {
#table-totals > * > * {
padding-left: 1.5rem;
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1rem;
}
#product-table-footer > *:last-child {
#table-totals > *:last-child {
background-color: var(--secondary-color);
color: white;
padding-top: 0.7rem;
@ -227,9 +234,10 @@
<div class="table-wrapper">
<table id="product-table" cellspacing="0"></table>
<table id="task-table" cellspacing="0"></table>
</div>
<div id="product-table-footer" cellspacing="0"></div>
<div id="table-totals" cellspacing="0"></div>
</td>
</tr>
</tbody>

View File

@ -147,4 +147,3 @@
</div>
<div id="footer"></div>

View File

@ -87,7 +87,8 @@
border-bottom: 1px solid var(--primary-color);
}
#product-table {
#product-table,
#task-table {
margin-top: 3rem;
margin-bottom: 200px;
min-width: 100%;
@ -95,49 +96,57 @@
overflow-wrap: break-word;
}
#product-table > thead {
#product-table > thead,
#task-table > thead {
text-align: left;
}
#product-table > thead > tr > th {
#product-table > thead > tr > th,
#task-table > thead > tr > th {
font-size: 1.2rem;
padding: 1rem;
background: var(--primary-color);
color: white;
}
#product-table > thead tr > th:last-child {
#product-table > thead tr > th:last-child,
#task-table > thead tr > th:last-child {
text-align: right;
}
#product-table > thead tr > th:first-child {
#product-table > thead tr > th:first-child,
#task-table > thead tr > th:first-child {
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
}
#product-table > thead tr > th:last-child {
#product-table > thead tr > th:last-child,
#task-table > thead tr > th:last-child {
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
}
#product-table > tbody > tr > td {
#product-table > tbody > tr > td,
#task-table > tbody > tr > td {
border-bottom: 1px solid var(--primary-color);
padding: 1rem;
}
#product-table > tbody > tr > td:first-child {
#product-table > tbody > tr > td:first-child,
#task-table > tbody > tr > td:first-child {
color: var(--primary-color);
}
#product-table > tbody > tr > td:last-child {
#product-table > tbody > tr > td:last-child,
#task-table > tbody > tr > td:last-child {
text-align: right;
}
#product-table-footer {
#table-totals {
page-break-inside: avoid;
}
#product-table-footer > * {
#table-totals > * {
display: grid;
grid-template-columns: 3fr 1fr 1fr;
padding-top: 0.5rem;
@ -145,22 +154,22 @@
gap: 20px;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due-label'],
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
font-weight: bold;
}
#product-table-footer
#table-totals
> *
[data-element='product-table-balance-due'] {
color: var(--primary-color);
}
#product-table-footer > * > :last-child {
#table-totals > * > :last-child {
text-align: right;
padding-right: 1rem;
}
@ -200,7 +209,9 @@
<table id="product-table" cellspacing="0"></table>
<div id="product-table-footer" cellspacing="0"></div>
<table id="task-table" cellspacing="0"></table>
<div id="table-totals" cellspacing="0"></div>
</div>
<div id="footer"></div>